fixed edit order