Fix for the hotfix