Retrieve correct target on events

Fixes #1

Thanks to Ksevio on Reddit