diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -762,7 +762,7 @@ static RoadVehicle *RoadVehFindCloseTo(R
 
 	if (++front->blocked_ctr > 1480) return NULL;
 
-	return (RoadVehicle *)rvf.best;
+	return RoadVehicle::From(rvf.best);
 }
 
 static void RoadVehArrivesAt(const RoadVehicle *v, Station *st)