Fix major bug in events