Fix the popup issue ?