Fix for popups