Fix event receiver
Merge pull request #265 from jmpascal/MERGING-1

Fix event receiver