diff --git a/src/resources/objects/SWGObject.java b/src/resources/objects/SWGObject.java
index 716ee5718..51bf32193 100644
--- a/src/resources/objects/SWGObject.java
+++ b/src/resources/objects/SWGObject.java
@@ -644,7 +644,13 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 	private final void sendSceneCreateObject(Player target) {
 		SceneCreateObjectByCrc create = new SceneCreateObjectByCrc();
 		create.setObjectId(objectId);
-		create.setLocation(location);
+		if (buildoutArea == null || !buildoutArea.isAdjustCoordinates())
+			create.setLocation(location);
+		else {
+			Location nLoc = new Location(location);
+			buildoutArea.adjustLocation(nLoc);
+			create.setLocation(nLoc);
+		}
 		create.setObjectCrc(crc);
 		if (target != null) {
 			target.sendPacket(create);
diff --git a/src/services/objects/ObjectAwareness.java b/src/services/objects/ObjectAwareness.java
index a4606c184..d90276606 100644
--- a/src/services/objects/ObjectAwareness.java
+++ b/src/services/objects/ObjectAwareness.java
@@ -198,12 +198,10 @@ public class ObjectAwareness extends Service {
 			transform.setSpeed((float) (obj.getMovementScale()*7.3));
 		}
 		BuildoutArea area = obj.getBuildoutArea();
-		if (area != null && area.isAdjustCoordinates())
-			newLocation.translatePosition(area.getX1(), 0, area.getZ1());
+		area.adjustLocation(newLocation);
 		new PlayerTransformedIntent(obj, obj.getParent(), null, obj.getLocation(), newLocation).broadcast();
 		move(obj, newLocation, true);
-		if (area != null && area.isAdjustCoordinates())
-			newLocation.translatePosition(-area.getX1(), 0, -area.getZ1());
+		area.readjustLocation(newLocation);
 		obj.sendDataTransforms(transform);
 	}