Fixed an oversight in EventManager

We should write some unit tests for this ASAP