diff --git a/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/M17N.cs b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/M17N.cs
index bec3eea5b..69e8c2fb7 100644
--- a/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/M17N.cs
+++ b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/M17N.cs
@@ -61,7 +61,7 @@ namespace UniGLTF.M17N
                 {
                     var match = GetAttribute(value, language);
                     // Attribute。無かったら enum の ToString
-                    map.Add(value, match != null ? match.Message : key.ToString());
+                    map.Add(value, match != null ? match.Message : value.ToString());
                 }
 
                 s_cache.Add(language, map);
diff --git a/Assets/UniGLTF/Tests/UniGLTF/M17NTest.cs b/Assets/UniGLTF/Tests/UniGLTF/M17NTest.cs
new file mode 100644
index 000000000..c125fcf53
--- /dev/null
+++ b/Assets/UniGLTF/Tests/UniGLTF/M17NTest.cs
@@ -0,0 +1,29 @@
+using NUnit.Framework;
+using UniGLTF.M17N;
+using UnityEngine;
+
+namespace UniGLTF
+{
+    public class M17NTest
+    {
+        enum M17NTestEnum
+        {
+            Foo,
+            Bar,
+            Baz,
+        }
+
+        [Test]
+        public void SimpleMsgTest()
+        {
+            Assert.AreEqual("Foo", M17NTestEnum.Foo.Msg());
+            Assert.AreEqual("Bar", M17NTestEnum.Bar.Msg());
+            Assert.AreEqual("Baz", M17NTestEnum.Baz.Msg());
+
+            // test caching
+            Assert.AreEqual("Foo", M17NTestEnum.Foo.Msg());
+            Assert.AreEqual("Bar", M17NTestEnum.Bar.Msg());
+            Assert.AreEqual("Baz", M17NTestEnum.Baz.Msg());
+        }
+    }
+}
diff --git a/Assets/UniGLTF/Tests/UniGLTF/M17NTest.cs.meta b/Assets/UniGLTF/Tests/UniGLTF/M17NTest.cs.meta
new file mode 100644
index 000000000..e24dbc124
--- /dev/null
+++ b/Assets/UniGLTF/Tests/UniGLTF/M17NTest.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e993fe746592bab4abe41c880b81555a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: