diff --git a/src/vim9script.c b/src/vim9script.c
index b946fb9..5bf2cc7 100644
--- a/src/vim9script.c
+++ b/src/vim9script.c
@@ -281,7 +281,7 @@
 
     hash_lock(ht);
     todo = (int)ht->ht_used;
-    for (hi = ht->ht_array; todo > 0; ++hi)
+    FOR_ALL_HASHTAB_ITEMS(ht, hi, todo)
     {
 	if (!HASHITEM_EMPTY(hi))
 	{