diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..f1fddd3f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.swp
\ No newline at end of file
diff --git a/library/kernel/converters/json_hash_table_converter.e b/library/kernel/converters/json_hash_table_converter.e
index 7971e1c2..cf3f9cfc 100644
--- a/library/kernel/converters/json_hash_table_converter.e
+++ b/library/kernel/converters/json_hash_table_converter.e
@@ -71,7 +71,11 @@ feature -- Conversion
             until
                 c.after
             loop
-                create js.make_json (c.key.out)
+                if attached {JSON_STRING} json.value (c.key) as l_key then
+                    js := l_key
+                else
+                    create js.make_json (c.key.out)
+                end
                 jv := json.value (c.item)
                 if jv /= Void then
                     Result.put (jv, js)