Fixed EventManager