Fix eventManager