Fixed the events reporting to listeners