Bugfix: fire the correct number of events