fix events being eaten in non-handler mode