case order_id fix