FIX: broken event_selector