diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
index b80dde8c80..cdebac8230 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
@@ -196,7 +196,7 @@ namespace OpenSim.Framework.Data.MySQL
                         {
                             SceneObjectGroup group = new SceneObjectGroup();
                             SceneObjectPart prim = buildPrim(primRow);
-                            DataRow shapeRow = shapes.Rows.Find(prim.UUID);
+                            DataRow shapeRow = shapes.Rows.Find(Util.ToRawUuidString(prim.UUID));
                             if (shapeRow != null)
                             {
                                 prim.Shape = buildShape(shapeRow);
@@ -216,7 +216,7 @@ namespace OpenSim.Framework.Data.MySQL
                         else
                         {
                             SceneObjectPart prim = buildPrim(primRow);
-                            DataRow shapeRow = shapes.Rows.Find(prim.UUID);
+                            DataRow shapeRow = shapes.Rows.Find(Util.ToRawUuidString(prim.UUID));
                             if (shapeRow != null)
                             {
                                 prim.Shape = buildShape(shapeRow);