Fix event processing bug