diff --git a/src/eval.c b/src/eval.c
index a647b51..c82e704 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -5415,7 +5415,7 @@
 	    // it is added to ht_stack, if it contains a list it is added to
 	    // list_stack.
 	    todo = (int)cur_ht->ht_used;
-	    for (hi = cur_ht->ht_array; todo > 0; ++hi)
+	    FOR_ALL_HASHTAB_ITEMS(cur_ht, hi, todo)
 		if (!HASHITEM_EMPTY(hi))
 		{
 		    --todo;