diff --git a/src/evalfunc.c b/src/evalfunc.c
index 1dc723f..135cb58 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -7825,7 +7825,7 @@
 	if (d != NULL)
 	{
 	    todo = (int)d->dv_hashtab.ht_used;
-	    for (hi = d->dv_hashtab.ht_array; todo > 0; ++hi)
+	    FOR_ALL_HASHTAB_ITEMS(&d->dv_hashtab, hi, todo)
 	    {
 		if (!HASHITEM_EMPTY(hi))
 		{