diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index 10d9623572..40e0a16975 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -611,7 +611,7 @@ static void ShipController(Vehicle *v)
 				} else if (v->dest_tile != 0) {
 					/* We have a target, let's see if we reached it... */
 					if (v->current_order.IsType(OT_GOTO_STATION) &&
-							IsBuoyTile(v->dest_tile) &&
+							GetStation(v->current_order.GetDestination())->IsBuoy() &&
 							DistanceManhattan(v->dest_tile, gp.new_tile) <= 3) {
 						/* We got within 3 tiles of our target buoy, so let's skip to our
 						* next order */