WIP: Fixed missing events.