fix last commit. events were showing up multiple times