diff --git a/modules/m_trace.c b/modules/m_trace.c
index 603922e6f..25206e56c 100644
--- a/modules/m_trace.c
+++ b/modules/m_trace.c
@@ -111,7 +111,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 			if(ac2ptr == NULL)
 			{
-				RB_DLINK_FOREACH(ptr, global_client_list.head)
+				RB_DLINK_FOREACH(ptr, global_serv_list.head)
 				{
 					ac2ptr = ptr->data;
 
diff --git a/src/s_serv.c b/src/s_serv.c
index 8b670c509..02632bbf6 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -157,7 +157,7 @@ hunt_server(struct Client *client_p, struct Client *source_p,
 	 */
 	if(!target_p && wilds)
 	{
-		RB_DLINK_FOREACH(ptr, global_client_list.head)
+		RB_DLINK_FOREACH(ptr, global_serv_list.head)
 		{
 			if(match(new, ((struct Client *) (ptr->data))->name))
 			{