diff --git a/plugins/org.etsi.mts.tdl.openapi2tdl.next/src/org/etsi/mts/tdl/openapi2tdl/next/OpenAPI2TDLTranslatorNext.java b/plugins/org.etsi.mts.tdl.openapi2tdl.next/src/org/etsi/mts/tdl/openapi2tdl/next/OpenAPI2TDLTranslatorNext.java
index eb06290666493edce37eb80fb6ed898fa1575fa4..38fcec1acdbb3d7b1307dbf1aa1702254d3453e5 100644
--- a/plugins/org.etsi.mts.tdl.openapi2tdl.next/src/org/etsi/mts/tdl/openapi2tdl/next/OpenAPI2TDLTranslatorNext.java
+++ b/plugins/org.etsi.mts.tdl.openapi2tdl.next/src/org/etsi/mts/tdl/openapi2tdl/next/OpenAPI2TDLTranslatorNext.java
@@ -687,7 +687,8 @@ public class OpenAPI2TDLTranslatorNext extends AbstractTranslator {
 							String javaName = enumVar.get("name");
 							String modelName = enumVar.get("value");
 							// Wrapped in ""
-							modelName = modelName.substring(1, modelName.length() - 1);
+							if (modelName.startsWith("\""))
+								modelName = modelName.substring(1, modelName.length() - 1);
 							
 							SimpleDataInstance literal = null;
 							for (SimpleDataInstance l: ((EnumDataType) type).getValue()) {