diff --git a/src/main/java/org/etsi/osl/tmf/util/PrimitivesParser.java b/src/main/java/org/etsi/osl/tmf/util/PrimitivesParser.java
index 645b2dbe0ad29faa388358b6624c7a97fdbd0a59..ca5a5da3e4c0772800eb817a203c5f1ea0765d81 100644
--- a/src/main/java/org/etsi/osl/tmf/util/PrimitivesParser.java
+++ b/src/main/java/org/etsi/osl/tmf/util/PrimitivesParser.java
@@ -146,7 +146,10 @@ public class PrimitivesParser {
         if (descriptor.trim().startsWith("[")) {
             // It's JSON
             vnfdJson = new JSONObject(descriptor.substring(1, descriptor.length() - 1));
-        } else {
+        } else if (descriptor.trim().startsWith("{")) {
+          // It's JSON
+          vnfdJson = new JSONObject(descriptor);
+      } else{
             // It's YAML
             Yaml yaml = new Yaml();
             Map<String, Object> yamlMap = yaml.load(descriptor);