Fix to Order Status change