diff --git a/OpenSim/Data/PGSQL/PGSQLManager.cs b/OpenSim/Data/PGSQL/PGSQLManager.cs
index 01e26d45ae..7deb942233 100644
--- a/OpenSim/Data/PGSQL/PGSQLManager.cs
+++ b/OpenSim/Data/PGSQL/PGSQLManager.cs
@@ -184,7 +184,11 @@ namespace OpenSim.Data.PGSQL
             }
             if (valueType == typeof(uint))
             {
-                return (int)value;
+                return (int)(uint)value;
+            }
+            if (valueType == typeof(ushort))
+            {
+                return (int)(ushort)value;
             }
             return value;
         }