Fixed definition of events