diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/Utils.cs b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/Utils.cs
index 2955773a01b..a5cb60f5e3e 100644
--- a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/Utils.cs
+++ b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/Utils.cs
@@ -273,7 +273,27 @@ public static void AddSchemaToRootDefinition(Schema schema, Dictionary<string, D
                     }
                     else 
                     {
-                        Definition def = (Definition)schema;
+                        Definition def = new Definition();
+                        if (schema is Definition)
+                        {
+                            def = (Definition)schema;
+                        }
+                        else
+                        {
+                            // Copy over properties to definition
+                            foreach (PropertyInfo property in schema.GetType().GetProperties())
+                            {
+                                var value = property.GetValue(schema);
+                                if (value != null)
+                                {
+                                    PropertyInfo targetProperty = def.GetType().GetProperty(property.Name);
+                                    if (targetProperty != null && targetProperty.CanWrite)
+                                    {
+                                        targetProperty.SetValue(def, value);
+                                    }
+                                }
+                            }
+                        }
                         if (definitions[schemaKey].IsRefObject())
                         {
                             definitions[schemaKey] = def;