Edit order fix