Fix for popup