Hotfix of the Hotfix