Properly identify the origin node in events