Fixed popup issue