fixed popup issue