1 files changed, 3 insertions, 1 deletions

diff --git a/src/util/container_multihashmap.c b/src/util/container_multihashmap.c
index 9ef8f74a4..a365e81d9 100644
--- a/src/util/container_multihashmap.c
+++ b/src/util/container_multihashmap.c
@@ -872,7 +872,9 @@ GNUNET_CONTAINER_multihashmap_iterator_next (struct GNUNET_CONTAINER_MultiHashMa
         return GNUNET_YES;
       }
     }
-    iter->idx++;
+    iter->idx += 1;
+    if (iter->idx < iter->map->map_length)
+      iter->me = iter->map->map[iter->idx];
   }
 }