FIX: Fix WX event order