Fixed bug with order cancellations