diff --git a/.gitignore b/.gitignore
index f1fddd3f..a1ff1e86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-*.swp
\ No newline at end of file
+*.swp
+EIFGENs
diff --git a/library/kernel/json_object.e b/library/kernel/json_object.e
index 9e6ec34c..e4a16192 100644
--- a/library/kernel/json_object.e
+++ b/library/kernel/json_object.e
@@ -161,7 +161,7 @@ feature -- Report
         do
             from
                 object.start
-                Result := object.item_for_iteration.hash_code
+                Result := object.out.hash_code
             until
                 object.off
             loop
diff --git a/test/autotest/test_suite/test_json_core.e b/test/autotest/test_suite/test_json_core.e
index d2faa7e1..ec17537a 100644
--- a/test/autotest/test_suite/test_json_core.e
+++ b/test/autotest/test_suite/test_json_core.e
@@ -778,6 +778,17 @@ feature -- Test
 
         end
 
+    test_json_object_hash_code
+        local
+            ht: HASH_TABLE [ANY, JSON_VALUE]
+            jo: JSON_OBJECT
+        do
+            create ht.make (1)
+            create jo.make
+            ht.force ("", jo)
+            assert ("ht.has_key (jo)", ht.has_key (jo))
+        end
+
     test_json_failed_json_conversion
             -- Test converting an Eiffel object to JSON that is based on a class
             -- for which no JSON converter has been registered.