diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index 3f814f6..66ddace 100644
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -392,12 +392,6 @@ build_target_list(int p_or_n, const char *command, struct Client *client_p,
 			continue;
 		}
 
-		if(strchr(nick, '@') || (IsOper(source_p) && (*nick == '$')))
-		{
-			handle_special(p_or_n, command, client_p, source_p, nick, text);
-			continue;
-		}
-
 		if(IsServer(client_p) && *nick == '=' && nick[1] == '#')
 		{
 			nick++;
@@ -424,6 +418,12 @@ build_target_list(int p_or_n, const char *command, struct Client *client_p,
 			continue;
 		}
 
+		if(strchr(nick, '@') || (IsOper(source_p) && (*nick == '$')))
+		{
+			handle_special(p_or_n, command, client_p, source_p, nick, text);
+			continue;
+		}
+
 		/* no matching anything found - error if not NOTICE */
 		if(p_or_n != NOTICE)
 		{