diff --git a/AI/StupidAI/StupidAI.cpp b/AI/StupidAI/StupidAI.cpp
index 8e0557d2d..b45ce9a23 100644
--- a/AI/StupidAI/StupidAI.cpp
+++ b/AI/StupidAI/StupidAI.cpp
@@ -108,7 +108,7 @@ BattleAction CStupidAI::activeStack( const CStack * stack )
 	if(stack->type->idNumber == CreatureID::CATAPULT)
 	{
 		BattleAction attack;
-		static const std::vector<int> wallHexes = {50, 183, 182, 130, 62, 29, 12, 95};
+		static const std::vector<int> wallHexes = {50, 183, 182, 130, 78, 29, 12, 95};
 
 		attack.destinationTile = *RandomGeneratorUtil::nextItem(wallHexes, CRandomGenerator::getDefault());
 		attack.actionType = Battle::CATAPULT;
diff --git a/client/battle/CBattleInterface.cpp b/client/battle/CBattleInterface.cpp
index 228b4f668..939a59ce1 100644
--- a/client/battle/CBattleInterface.cpp
+++ b/client/battle/CBattleInterface.cpp
@@ -3451,7 +3451,7 @@ BattleObjectsByHex CBattleInterface::sortObjectsByHex()
 		sorted.afterAll.walls.push_back(SiegeHelper::BOTTOM_TOWER);
 		sorted.hex[182].walls.push_back(SiegeHelper::BOTTOM_WALL);
 		sorted.hex[130].walls.push_back(SiegeHelper::WALL_BELLOW_GATE);
-		sorted.hex[62].walls.push_back(SiegeHelper::WALL_OVER_GATE);
+		sorted.hex[78].walls.push_back(SiegeHelper::WALL_OVER_GATE);
 		sorted.hex[12].walls.push_back(SiegeHelper::UPPER_WALL);
 		sorted.beforeAll.walls.push_back(SiegeHelper::UPPER_TOWER);
 		sorted.hex[94].walls.push_back(SiegeHelper::GATE);
diff --git a/client/battle/CBattleInterface.h b/client/battle/CBattleInterface.h
index ca459771e..dbf33913c 100644
--- a/client/battle/CBattleInterface.h
+++ b/client/battle/CBattleInterface.h
@@ -214,7 +214,7 @@ private:
 			WALL_OVER_GATE,
 			UPPER_WALL,
 			UPPER_TOWER,
-			GATE = 9,
+			GATE,
 			GATE_ARCH,
 			BOTTOM_STATIC_WALL,
 			UPPER_STATIC_WALL,
diff --git a/lib/CBattleCallback.cpp b/lib/CBattleCallback.cpp
index 08de2e8a7..190ffc5c9 100644
--- a/lib/CBattleCallback.cpp
+++ b/lib/CBattleCallback.cpp
@@ -62,13 +62,13 @@ namespace SiegeStuffThatShouldBeMovedToHandlers //  <=== TODO
 		std::make_pair(183, EWallPart::BOTTOM_TOWER),
 		std::make_pair(182, EWallPart::BOTTOM_WALL),
 		std::make_pair(130, EWallPart::BELOW_GATE),
-		std::make_pair(62,  EWallPart::OVER_GATE),
+		std::make_pair(78,  EWallPart::OVER_GATE),
 		std::make_pair(29,  EWallPart::UPPER_WALL),
 		std::make_pair(12,  EWallPart::UPPER_TOWER),
 		std::make_pair(95,  EWallPart::INDESTRUCTIBLE_PART_OF_GATE),
 		std::make_pair(96,  EWallPart::GATE),
 		std::make_pair(45,  EWallPart::INDESTRUCTIBLE_PART),
-		std::make_pair(78,  EWallPart::INDESTRUCTIBLE_PART),
+		std::make_pair(62,  EWallPart::INDESTRUCTIBLE_PART),
 		std::make_pair(112, EWallPart::INDESTRUCTIBLE_PART),
 		std::make_pair(147, EWallPart::INDESTRUCTIBLE_PART)
 	};