diff --git a/com.reprezen.swagedit/src/com/reprezen/swagedit/editor/SwaggerDocument.java b/com.reprezen.swagedit/src/com/reprezen/swagedit/editor/SwaggerDocument.java
index a7692cc6..2131d22c 100644
--- a/com.reprezen.swagedit/src/com/reprezen/swagedit/editor/SwaggerDocument.java
+++ b/com.reprezen.swagedit/src/com/reprezen/swagedit/editor/SwaggerDocument.java
@@ -397,7 +397,8 @@ private void parseYaml(String content) {
 
     private void parseJson(String content) {
         try {
-            jsonContent = mapper.readTree(content);
+            Object expandedYamlObject = new com.fasterxml.jackson.dataformat.yaml.snakeyaml.Yaml().load(content);
+            jsonContent = mapper.readTree(mapper.writeValueAsString(expandedYamlObject));
             jsonError = null;
         } catch (Exception e) {
             jsonContent = null;