diff --git a/sys/sys/queue.h b/sys/sys/queue.h
index 3995ca06bc30..35b7539067d4 100644
--- a/sys/sys/queue.h
+++ b/sys/sys/queue.h
@@ -289,7 +289,7 @@ struct {								\
 #define	STAILQ_LAST(head, type, field)					\
 	(STAILQ_EMPTY((head)) ?						\
 		NULL :							\
-		__member2struct(type, field, (head)->stqh_last))
+		__member2struct(type, field.stqe_next, (head)->stqh_last))
 
 #define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
 
@@ -427,7 +427,7 @@ struct {								\
 #define	LIST_PREV(elm, head, type, field)				\
 	((elm)->field.le_prev == &LIST_FIRST((head)) ?			\
 		NULL :							\
-		__member2struct(type, field, (elm)->field.le_prev))
+		__member2struct(type, field.le_next, (elm)->field.le_prev))
 
 #define	LIST_REMOVE(elm, field) do {					\
 	QMD_SAVELINK(oldnext, (elm)->field.le_next);			\