diff --git a/lib/linklist.h b/lib/linklist.h
index f0ae362..24a9e20 100644
--- a/lib/linklist.h
+++ b/lib/linklist.h
@@ -90,7 +90,7 @@
 #define ALL_LIST_ELEMENTS(list,node,nextnode,data) \
   (node) = listhead(list), ((data) = NULL); \
   (node) != NULL && \
-    ((data) = listgetdata(node),(nextnode) = listnextnode(node), 1); \
+    ((data) = listgetdata(node),(nextnode) = node->next, 1); \
   (node) = (nextnode), ((data) = NULL)
 
 /* read-only list iteration macro.