MYLOC-136 - Fixing event handling