fixed EventManager again