Hotfix for logging