fix event dispatching
Merge pull request #338 from ahilles107/v4.2

fix event dispatching