diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenGenerateRDL.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenGenerateRDL.java
index ec0c24c..065243b 100644
--- a/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenGenerateRDL.java
+++ b/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenGenerateRDL.java
@@ -34,8 +34,7 @@
                 for (StringValue key3 : metamap.keySet()){
                     String metaIdString = key3.getStringValue(); //MetaIDをStringValue(key3)からStringへ変換
                     Value data = metamap.get(key3); //Dataを取得
-                    String dataString = data.toString();
-                    createScreenDefinition(scIdString, wIdString, metaIdString, dataString, spec);
+                    createScreenDefinition(scIdString, wIdString, metaIdString, data, spec);
                 }
             }
         }
@@ -55,9 +54,9 @@
     }
 
     //ex [wText : wId -> "editBotton"] : scId -> "一覧画面"] := "編集"
-    private void createScreenDefinition(String scIdName, String wIdName, String metaIdName, String dataName, RDLSpec spec){
+    private void createScreenDefinition(String scIdName, String wIdName, String metaIdName, Value dataName, RDLSpec spec){
         RDLSpecDependencyTerm insideDependencyTerm = new RDLSpecDependencyTerm(spec.getConstant(metaIdName, RDLSpecLang.typeString), new ArrayList<>(Arrays.asList(spec.getRDLSpecResourceDeclaration("wId").getResource())), new ArrayList<>(Arrays.asList(spec.getConstant(wIdName, RDLSpecLang.typeString))));
         RDLSpecDependencyTerm outsideDependencyTerm = new RDLSpecDependencyTerm(insideDependencyTerm, new ArrayList<>(Arrays.asList(spec.getRDLSpecResourceDeclaration("scId").getResource())), new ArrayList<>(Arrays.asList(spec.getConstant(scIdName, RDLSpecLang.typeString))));
-        spec.addRDLSpecStatement(new RDLSpecInitialization(outsideDependencyTerm, spec.getConstant(dataName, RDLSpecLang.typeString)));
+        spec.addRDLSpecStatement(new RDLSpecInitialization(outsideDependencyTerm, spec.getConstant(dataName.toString(), checkValueType(dataName))));
     }
 }
diff --git a/src/main/java/org/ntlab/rdlcanvas/parser/StringValue.java b/src/main/java/org/ntlab/rdlcanvas/parser/StringValue.java
index 2afdc75..344c334 100644
--- a/src/main/java/org/ntlab/rdlcanvas/parser/StringValue.java
+++ b/src/main/java/org/ntlab/rdlcanvas/parser/StringValue.java
@@ -16,6 +16,6 @@
     // 文字列をtoStringメゾットとして返す
     @Override
     public String toString() {
-        return "\"" + stringValue + "\"";
+        return stringValue ;
     }
 }