BUG: Forgot to reset number of events in queue