fixing order_by