Event dispatching: Improvement & bugfix