Fixed event type implementation