Hotfix for that previous hotfix