Event dispatcher fix

Q | A
------------- | -------------
Bug fix? |	yes
New feature? |	no
BC breaks? | no
Deprecations? | no
Tests pass? |	yes
Fixed tickets |	#19
License | MIT
Doc PR |