Editing order fix