Fix for EventManager