Event dispatching fixed