- fixes for event's