Changed the calling of the event