Fixed event manager dependancy