Fixed problem with popups