diff --git a/rail_map.h b/rail_map.h
index 4d609fc377..2755940c0e 100644
--- a/rail_map.h
+++ b/rail_map.h
@@ -137,7 +137,7 @@ static inline DiagDirection GetRailDepotDirection(TileIndex t)
 
 static inline Axis GetWaypointAxis(TileIndex t)
 {
-	return HASBIT(_m[t].m5, 0) ? AXIS_Y : AXIS_X;
+	return (Axis)GB(_m[t].m5, 0, 1);
 }
 
 static inline Track GetRailWaypointTrack(TileIndex t)