Critical Bugfix with events