Hotfix for the last hotfix