HI: Events: Fix this mess