Removed multiple dispatching of events