Modal hotfix