diff --git a/src/Mod/Arch/ArchSite.py b/src/Mod/Arch/ArchSite.py
index 0f72153554..aa57894e4f 100644
--- a/src/Mod/Arch/ArchSite.py
+++ b/src/Mod/Arch/ArchSite.py
@@ -63,7 +63,11 @@ def makeSite(objectslist=None,baseobj=None,name="Site"):
     if objectslist:
         obj.Group = objectslist
     if baseobj:
-        obj.Terrain = baseobj
+        import Part
+        if isinstance(baseobj,Part.Shape):
+            obj.Shape = baseobj
+        else:
+            obj.Terrain = baseobj
     return obj