fix order for events