diff --git a/src/Libraries/CoreNodes/Data.cs b/src/Libraries/CoreNodes/Data.cs
index 1288242393a..07837537835 100644
--- a/src/Libraries/CoreNodes/Data.cs
+++ b/src/Libraries/CoreNodes/Data.cs
@@ -102,6 +102,8 @@ private static object DynamoJObjectToNative(JObject jObject)
                     case "dynamo.geometry:sab-1.0.0":
                     case "dynamo.goemetry:tsm-1.0.0":
                     case "dynamo.geometry:rectangle-1.0.0":
+                    case "dynamo.geometry:cuboid-1.0.0":
+                    case "dynamo.geometry:solid-1.0.0":
                     case string geoId when geoId.Contains("autodesk.geometry"):
                         return Geometry.FromJson(jObject.ToString());
 
@@ -165,7 +167,7 @@ public static string StringifyJSON([ArbitraryDimensionArrayImport] object values
                     new DictConverter(),
                     new DesignScriptGeometryConverter(),
                     new ColorConveter(),
-                    //new LocationConverter(),
+                    new LocationConverter(),
                     new ImageConverter()
                 });
         }