Quick fix and improved logging