diff --git a/binaries/data/mods/public/simulation/ai/petra/baseManager.js b/binaries/data/mods/public/simulation/ai/petra/baseManager.js
index 41e998bc00..b4aa9838b2 100644
--- a/binaries/data/mods/public/simulation/ai/petra/baseManager.js
+++ b/binaries/data/mods/public/simulation/ai/petra/baseManager.js
@@ -801,8 +801,8 @@ m.BaseManager.prototype.assignToFoundations = function(gameState, noRepair)
 		if (target.hasClass("Fortress") || target.hasClass("Wonder") ||
 		    target.getMetadata(PlayerID, "phaseUp") == true)
 			targetNB = 7;
-		else if (target.hasClass("Barracks") || target.hasClass("DefenseTower") ||
-		         target.hasClass("Market"))
+		else if (target.hasClass("Barracks") || target.hasClass("Range") || target.hasClass("Stable") ||
+		         target.hasClass("DefenseTower") || target.hasClass("Market"))
 			targetNB = 4;
 		else if (target.hasClass("House") || target.hasClass("DropsiteWood"))
 			targetNB = 3;
diff --git a/binaries/data/mods/public/simulation/ai/petra/headquarters.js b/binaries/data/mods/public/simulation/ai/petra/headquarters.js
index 5e1d6b150e..c91b39b1da 100644
--- a/binaries/data/mods/public/simulation/ai/petra/headquarters.js
+++ b/binaries/data/mods/public/simulation/ai/petra/headquarters.js
@@ -1922,8 +1922,7 @@ m.HQ.prototype.constructTrainingBuildings = function(gameState, queues)
 	let barracksTemplate = this.canBuild(gameState, "structures/{civ}_barracks") ? "structures/{civ}_barracks" : undefined;
 
 	let rangeTemplate = this.canBuild(gameState, "structures/{civ}_range") ? "structures/{civ}_range" : undefined;
-	let numRanges = gameState.getOwnEntitiesByClass("Archery", true).length;
-	numBarracks -= numRanges;
+	let numRanges = gameState.getOwnEntitiesByClass("Range", true).length;
 
 	let stableTemplate = this.canBuild(gameState, "structures/{civ}_stables") ? "structures/{civ}_stables" :
 	                     this.canBuild(gameState, "structures/{civ}_stable") ? "structures/{civ}_stable" : undefined;