Fixed editing order