diff --git a/binaries/data/mods/public/maps/scenarios/units_demo.js b/binaries/data/mods/public/maps/scenarios/units_demo.js
index effd047fc2..fe904c0158 100644
--- a/binaries/data/mods/public/maps/scenarios/units_demo.js
+++ b/binaries/data/mods/public/maps/scenarios/units_demo.js
@@ -12,7 +12,7 @@ let startZ = 20;
 /**
  * Horizontal coordinate of the last entity in the current row.
  */
-let stopX = 1580;
+let stopX = 1870;
 
 /**
  * Coordinates of the current entity.
@@ -64,6 +64,12 @@ for (let template of cmpTemplateManager.FindAllTemplates(actors))
 		maxh = 0;
 	}
 
+	if (z >= stopX)
+	{
+		error(template + " would be placed out of map [" +(x + w / 2) + ", " + z + "]");
+		continue;
+	}
+
 	let cmpPosition = Engine.QueryInterface(ent, IID_Position);
 	if (!cmpPosition)
 	{
@@ -72,7 +78,7 @@ for (let template of cmpTemplateManager.FindAllTemplates(actors))
 		continue;
 	}
 
-	cmpPosition.MoveTo(x + w / 2, z);
+	cmpPosition.JumpTo(x + w / 2, z);
 	cmpPosition.SetYRotation(Math.PI * 3 / 4);
 
 	let cmpOwnership = Engine.QueryInterface(ent, IID_Ownership);
diff --git a/binaries/data/mods/public/maps/scenarios/units_demo.xml b/binaries/data/mods/public/maps/scenarios/units_demo.xml
index 112e897bf3..66c68ac1cf 100644
--- a/binaries/data/mods/public/maps/scenarios/units_demo.xml
+++ b/binaries/data/mods/public/maps/scenarios/units_demo.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94e90a754c8ecf1761c5d2121b4d05c3506d9980ce9a7a655cf4c7898e80a1d0
-size 1090
+oid sha256:22f1aabe8acf06f78550643baef580595b0b8c308e3082484747d7ef4f04510e
+size 1089