Fixed saving of event