diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 77b94408d8..3d80c6eefc 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -559,7 +559,7 @@ namespace OpenSim
             {
                 scene.ForEachSOG(delegate(SceneObjectGroup sog)
                 {
-                    if (sog.AttachmentPoint == 0)
+                    if (!sog.IsAttachment)
                     {
                         sog.RootPart.UpdateRotation(rot * sog.GroupRotation);
                         Vector3 offset = sog.AbsolutePosition - center;
@@ -588,7 +588,7 @@ namespace OpenSim
             {
                 scene.ForEachSOG(delegate(SceneObjectGroup sog)
                 {
-                    if (sog.AttachmentPoint == 0)
+                    if (!sog.IsAttachment)
                     {
                         if (sog.RootPart.AbsolutePosition.Z < minZ)
                             minZ = sog.RootPart.AbsolutePosition.Z;
@@ -600,7 +600,7 @@ namespace OpenSim
             {
                 scene.ForEachSOG(delegate(SceneObjectGroup sog)
                 {
-                    if (sog.AttachmentPoint == 0)
+                    if (!sog.IsAttachment)
                     {
                         Vector3 tmpRootPos = sog.RootPart.AbsolutePosition;
                         tmpRootPos.Z -= minZ;
@@ -640,7 +640,7 @@ namespace OpenSim
             {
                 scene.ForEachSOG(delegate(SceneObjectGroup sog)
                 {
-                    if (sog.AttachmentPoint == 0)
+                    if (!sog.IsAttachment)
                         sog.UpdateGroupPosition(sog.AbsolutePosition + offset);
                 });
             });
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 0c4b79b948..2e638d4cc2 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -483,7 +483,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 SceneObjectGroup sceneObject = serialiser.DeserializeGroupFromXml2(serialisedSceneObject);
 
                 // Happily this does not do much to the object since it hasn't been added to the scene yet
-                if (sceneObject.AttachmentPoint == 0)
+                if (!sceneObject.IsAttachment)
                 {
                     if (m_displacement != Vector3.Zero || m_rotation != 0f)
                     {