FIX: Fix event order