diff --git a/src/hashtab.c b/src/hashtab.c
index ddf1877..b7f8658 100644
--- a/src/hashtab.c
+++ b/src/hashtab.c
@@ -108,7 +108,7 @@
     hashitem_T	*hi;
 
     todo = (long)ht->ht_used;
-    for (hi = ht->ht_array; todo > 0; ++hi)
+    FOR_ALL_HASHTAB_ITEMS(ht, hi, todo)
     {
 	if (!HASHITEM_EMPTY(hi))
 	{