diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 157a4b8fad..74715c0d22 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -258,7 +258,7 @@ namespace OpenSim.Data.SQLite
             {
                 DataTable regionsettings = ds.Tables["regionsettings"];
 
-                DataRow settingsRow = regionsettings.Rows.Find(Util.ToRawUuidString(rs.RegionUUID));
+                DataRow settingsRow = regionsettings.Rows.Find(rs.RegionUUID.ToString());
                 if (settingsRow == null)
                 {
                     settingsRow = regionsettings.NewRow();
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index f9c5565091..9c3b6518ed 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -142,6 +142,26 @@ namespace OpenSim.Data.Tests
             Assert.That(r2.RegionUUID, Is.EqualTo(region2));
         }
 
+        [Test]
+        public void T101_UpdateRegionInfo()
+        {
+            bool blockfly = true;
+            double sunpos = 0.5;
+            UUID cov = UUID.Random();
+
+            RegionSettings r1 = db.LoadRegionSettings(region1);
+            r1.BlockFly = blockfly;
+            r1.SunPosition = sunpos;
+            r1.Covenant = cov;
+            db.StoreRegionSettings(r1);
+            
+            RegionSettings r2 = db.LoadRegionSettings(region1);
+            Assert.That(r2.RegionUUID, Is.EqualTo(region1));
+            Assert.That(r2.SunPosition, Is.EqualTo(sunpos));
+            Assert.That(r2.BlockFly, Is.EqualTo(blockfly));
+            Assert.That(r2.Covenant, Is.EqualTo(cov));
+        }
+
         [Test]
         public void T300_NoTerrain()
         {