Events bugfix