diff --git a/OpenRA.Mods.Common/Traits/Buildings/Bridge.cs b/OpenRA.Mods.Common/Traits/Buildings/Bridge.cs
index 846e09ef8f..f9240716b0 100644
--- a/OpenRA.Mods.Common/Traits/Buildings/Bridge.cs
+++ b/OpenRA.Mods.Common/Traits/Buildings/Bridge.cs
@@ -152,6 +152,7 @@ namespace OpenRA.Mods.Common.Traits
 
 		internal void AddHut(BridgeHut hut)
 		{
+			// TODO: This method is incomprehensible and fragile, and should be rewritten.
 			if (huts[0] == huts[1])
 				huts[1] = hut;
 			if (Hut == null)
@@ -161,7 +162,7 @@ namespace OpenRA.Mods.Common.Traits
 					huts[0] = hut; // Set only first time
 				for (var d = 0; d <= 1; d++)
 					for (var b = neighbours[d]; b != null; b = b.Hut == null ? b.neighbours[d] : null)
-						b.huts[1 - d] = hut;
+						b.huts[d] = hut;
 			}
 			else
 				Hut = null;
diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml
index 1380d7440f..f7e01e7ef0 100644
--- a/mods/ra/rules/civilian.yaml
+++ b/mods/ra/rules/civilian.yaml
@@ -493,8 +493,9 @@ BRIDGEHUT:
 	Building:
 		Footprint: __ __
 		Dimensions: 2,2
-	CustomSelectionSize:
-		CustomBounds: 48,48
+	Selectable:
+		Bounds: 48,48
+		Priority: 2
 	BridgeHut:
 	Targetable:
 		TargetTypes: BridgeHut, C4
@@ -504,8 +505,9 @@ BRIDGEHUT.small:
 	Building:
 		Footprint: _
 		Dimensions: 1,1
-	CustomSelectionSize:
-		CustomBounds: 24,24
+	Selectable:
+		Bounds: 24,24
+		Priority: 2
 	BridgeHut:
 	Targetable:
 		TargetTypes: BridgeHut, C4