diff --git a/src/system/kernel/kernel_daemon.cpp b/src/system/kernel/kernel_daemon.cpp
index 9c1509e3d9..4d572144f1 100644
--- a/src/system/kernel/kernel_daemon.cpp
+++ b/src/system/kernel/kernel_daemon.cpp
@@ -178,14 +178,14 @@ KernelDaemon::_NextDaemon(struct daemon& marker)
 		// The marker is not part of the list yet, just return the first entry
 		daemon = fDaemons.Head();
 	} else {
-		daemon = marker.GetDoublyLinkedListLink()->next;
+		daemon = fDaemons.GetNext(&marker);
 		fDaemons.Remove(&marker);
 	}
 
 	marker.arg = daemon;
 
 	if (daemon != NULL)
-		fDaemons.Insert(daemon->GetDoublyLinkedListLink()->next, &marker);
+		fDaemons.InsertAfter(daemon, &marker);
 
 	return daemon;
 }