Fixed edit order problems