FIX: No pop up issue fixed.