Fixed event target bug
Merge pull request #419 from stefk/msg-bug-fix

Fixed event target bug