Fixed ordering by order_id