issue #109 edit order