resolve popup issues