fixe popup issues