Hotfix that is not so hot