diff --git a/src/ai/default/default.cpp b/src/ai/default/default.cpp
--- a/src/ai/default/default.cpp
+++ b/src/ai/default/default.cpp
@@ -143,8 +143,8 @@ static EngineID AiChooseTrainToBuild(Rai
 		const Engine* e = GetEngine(i);
 
 		if (!IsCompatibleRail(rvi->railtype, railtype) ||
-				rvi->flags & RVI_WAGON ||
-				(rvi->flags & RVI_MULTIHEAD && flag & 1) ||
+				rvi->railveh_type == RAILVEH_WAGON ||
+				(rvi->railveh_type == RAILVEH_MULTIHEAD && flag & 1) ||
 				!HASBIT(e->player_avail, _current_player) ||
 				e->reliability < 0x8A3D) {
 			continue;
@@ -2366,7 +2366,7 @@ static EngineID AiFindBestWagon(CargoID 
 		const Engine* e = GetEngine(i);
 
 		if (!IsCompatibleRail(rvi->railtype, railtype) ||
-				!(rvi->flags & RVI_WAGON) ||
+				rvi->railveh_type != RAILVEH_WAGON ||
 				!HASBIT(e->player_avail, _current_player)) {
 			continue;
 		}