diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 2cd4198123..cd87f6bfed 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -2166,12 +2166,14 @@ namespace OpenSim.Region.Framework.Scenes
             if (OnObjectCreateBySync != null)
                 OnObjectCreateBySync(sceneObject);
 
-
             lock (SceneObjectGroupsByFullID)
-            {
                 SceneObjectGroupsByFullID[sceneObject.UUID] = sceneObject;
+
+            lock (SceneObjectGroupsByFullPartID)
+            {
+                SceneObjectGroupsByFullPartID[sceneObject.UUID] = sceneObject;
                 foreach (SceneObjectPart part in children)
-                    SceneObjectGroupsByFullID[part.UUID] = sceneObject;
+                    SceneObjectGroupsByFullPartID[part.UUID] = sceneObject;
             }
 
             lock (SceneObjectGroupsByLocalPartID)