FIX THE POPUP