@@ -211,7 +211,7 @@ local function staticCtorSetBase(cls)
     cls[k] = v
   end
   cls[cls] = nil
-  local kind = cls.kind
+  local kind = cls.__kind__
   cls.__kind__ = nil
   setBase(cls, kind)
   cls:__staticCtor__()
@@ -903,16 +903,21 @@ ValueType = {
     return setmetatable({}, cls)
   end,
   __clone__ = function(this)
-    local cls = getmetatable(this)
-    local t = {}
-    for k, v in pairs(this) do
-      if type(v) == "table" and v.__kind__ == "S" then
-        t[k] = v:__clone__()
-      else
-        t[k] = v
+    local type_ = type(this)
+    if type_ == "number" or type_ == "bool" then
+      return this
+    elseif type_ == "table" then
+      local cls = getmetatable(this)
+      local t = {}
+      for k, v in pairs(this) do
+        if type(v) == "table" and v.__kind__ == "S" then
+          t[k] = v:__clone__()
+        else
+          t[k] = v
+        end
       end
+      return setmetatable(t, cls)
     end
-    return setmetatable(t, cls)
   end,
   EqualsObj = function (this, obj)
     if getmetatable(this) ~= getmetatable(obj) then return false end
 
@@ -292,16 +292,3 @@ test(testSplit, "testSplit")
 --test(testConsole, "Console")
 --test(testIO, "IO")
 test(testStringBuilder, "StringBuilder")
-
- local pos = System.MultiArray(System.Int)({
-        2,
-        2,
-        3
-      }, 1, 2, 3, 3, 4, 5, 1, 3, 3, 2, 3, 4)
-      System.Console.WriteLine(pos:get(0, 1, 1))
-      local arr = System.MultiArray(System.Int)({
-        2,
-        3
-      }, 1, 2, 4, 3, 4, 6)
-      System.Console.WriteLine(arr:get(0, 0))
-