fix order status flow