Fix EventManager