...and fix the event ordering issue. Dispatch != QueueEvent