diff --git a/server/src/list.c b/server/src/list.c
index 4bbdb89f4..e06bd4268 100644
--- a/server/src/list.c
+++ b/server/src/list.c
@@ -30,8 +30,8 @@ void list_destroy(struct list *l)
 	pthread_mutex_lock(&l->lock);
 
 	if (l->destructor) {
-		for (void *e = l->start; e != l->end; e++)
-			l->destructor(e);
+		list_foreach(void *p, l) 
+			l->destructor(p);
 	}
 	
 	free(l->start);