Popup hotfix