fixed order/edit bug