fix edit ordering