Hotfix for invalid return code