Bug fixed to Event Manager