fixed more popups