diff --git a/binaries/data/mods/public/globalscripts/Templates.js b/binaries/data/mods/public/globalscripts/Templates.js
index d105ba114d..5fc0287672 100644
--- a/binaries/data/mods/public/globalscripts/Templates.js
+++ b/binaries/data/mods/public/globalscripts/Templates.js
@@ -226,10 +226,10 @@ function GetTemplateDataHelper(template, player, auraTemplates, resources, modif
 			};
 
 			if (template.BuildRestrictions.Distance.MinDistance)
-				ret.buildRestrictions.distance.min = +template.BuildRestrictions.Distance.MinDistance;
+				ret.buildRestrictions.distance.min = getEntityValue("BuildRestrctions/Distance/MinDistance");
 
 			if (template.BuildRestrictions.Distance.MaxDistance)
-				ret.buildRestrictions.distance.max = +template.BuildRestrictions.Distance.MaxDistance;
+				ret.buildRestrictions.distance.max = getEntityValue("BuildRestrctions/Distance/MaxDistance");
 		}
 	}
 
diff --git a/binaries/data/mods/public/simulation/components/BuildRestrictions.js b/binaries/data/mods/public/simulation/components/BuildRestrictions.js
index 3b9dbd29ca..fa8156cfd3 100644
--- a/binaries/data/mods/public/simulation/components/BuildRestrictions.js
+++ b/binaries/data/mods/public/simulation/components/BuildRestrictions.js
@@ -254,6 +254,11 @@ BuildRestrictions.prototype.CheckPlacement = function()
 			return result;	// Fail
 		}
 	}
+	
+	let cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
+
+	let templateName = cmpTemplateManager.GetCurrentTemplateName(this.entity);
+	let template = cmpTemplateManager.GetTemplate(templateName.substr(templateName.lastIndexOf("|") + 1));
 
 	// Check distance restriction
 	if (this.template.Distance)
@@ -268,45 +273,43 @@ BuildRestrictions.prototype.CheckPlacement = function()
 			return cmpIdentity.GetClassesList().indexOf(cat) > -1;
 		};
 
-		if (this.template.Distance.MinDistance)
+		if (this.template.Distance.MinDistance !== undefined)
 		{
-			var dist = +this.template.Distance.MinDistance;
-			var nearEnts = cmpRangeManager.ExecuteQuery(this.entity, 0, dist, [cmpPlayer.GetPlayerID()], IID_BuildRestrictions).filter(filter);
-			if (nearEnts.length)
+			let minDistance = ApplyValueModificationsToTemplate("BuildRestrictions/Distance/MinDistance", +this.template.Distance.MinDistance, cmpPlayer.GetPlayerID(), template);
+			if (cmpRangeManager.ExecuteQuery(this.entity, 0, minDistance, [cmpPlayer.GetPlayerID()], IID_BuildRestrictions).some(filter))
 			{
-				var result = markForPluralTranslation(
+				let result = markForPluralTranslation(
 					"%(name)s too close to a %(category)s, must be at least %(distance)s meter away",
 					"%(name)s too close to a %(category)s, must be at least %(distance)s meters away",
-					+this.template.Distance.MinDistance);
+					minDistance);
 
 				result.success = false;
 				result.translateMessage = true;
 				result.parameters = {
 					"name": name,
 					"category": cat,
-					"distance": this.template.Distance.MinDistance
+					"distance": minDistance
 				};
 				result.translateParameters = ["name", "category"];
 				return result;  // Fail
 			}
 		}
-		if (this.template.Distance.MaxDistance)
+		if (this.template.Distance.MaxDistance !== undefined)
 		{
-			var dist = +this.template.Distance.MaxDistance;
-			var nearEnts = cmpRangeManager.ExecuteQuery(this.entity, 0, dist, [cmpPlayer.GetPlayerID()], IID_BuildRestrictions).filter(filter);
-			if (!nearEnts.length)
+			let maxDistance = ApplyValueModificationsToTemplate("BuildRestrictions/Distance/MaxDistance", +this.template.Distance.MaxDistance, cmpPlayer.GetPlayerID(), template);
+			if (!cmpRangeManager.ExecuteQuery(this.entity, 0, maxDistance, [cmpPlayer.GetPlayerID()], IID_BuildRestrictions).some(filter))
 			{
-				var result = markForPluralTranslation(
+				let result = markForPluralTranslation(
 					"%(name)s too far from a %(category)s, must be within %(distance)s meter",
 					"%(name)s too far from a %(category)s, must be within %(distance)s meters",
-					+this.template.Distance.MaxDistance);
+					maxDistance);
 
 				result.success = false;
 				result.translateMessage = true;
 				result.parameters = {
 					"name": name,
 					"category": cat,
-					"distance": this.template.Distance.MaxDistance
+					"distance": maxDistance
 				};
 				result.translateParameters = ["name", "category"];
 				return result;	// Fail