events order fix