Fix distance - order_by !