diff --git a/src/session.c b/src/session.c
index a34eedf..e39ce4d 100644
--- a/src/session.c
+++ b/src/session.c
@@ -543,7 +543,7 @@
     char_u	*p, *t;
 
     todo = (int)gvht->ht_used;
-    for (hi = gvht->ht_array; todo > 0; ++hi)
+    FOR_ALL_HASHTAB_ITEMS(gvht, hi, todo)
     {
 	if (!HASHITEM_EMPTY(hi))
 	{