Bugfix for popups