Fixed saving of events