Fix major bug in events
Merge