Hotfix for debug mode