Index: binaries/data/mods/public/maps/scenarios/units_demo.js
===================================================================
--- binaries/data/mods/public/maps/scenarios/units_demo.js
+++ binaries/data/mods/public/maps/scenarios/units_demo.js
@@ -12,7 +12,7 @@
 /**
  * Horizontal coordinate of the last entity in the current row.
  */
-let stopX = 1580;
+let stopX = 1680;
 
 /**
  * Coordinates of the current entity.
@@ -64,6 +64,12 @@
 		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 @@
 		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);
Index: binaries/data/mods/public/maps/scenarios/units_demo.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/units_demo.xml
+++ binaries/data/mods/public/maps/scenarios/units_demo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <Scenario version="7">
-	<Terrain patches="25" texture="blackness" priority="0" height="16384"/>
+	<Terrain patches="30" texture="blackness" priority="0" height="18384"/>
 	<Environment>
 		<SkySet>default</SkySet>
 		<SunColor r="0.811765" g="0.792157" b="0.701961"/>