FIX: Fix events