Bugfix of events