diff --git a/server/message.js b/server/message.js
index e629779..85d488d 100644
--- a/server/message.js
+++ b/server/message.js
@@ -8,12 +8,12 @@ module.exports = function(client, owners, message, globalPrefix){
 		prefix = serverPrefix;
 	}
 
-	if (!message.guild || message.author.bot || !message.content.startsWith(prefix)) return;
 	
 	if(message.content.startsWith(`<@${client.user.id}>`)){
 		let regex = new RegExp("(<@" + client.user.id + ">) *")
 		message.content = message.content.replace(regex, prefix);
 	}	
+	if (!message.guild || message.author.bot || !message.content.startsWith(prefix)) return;
 	let args = message.content.slice(prefix.length).split(" ")
 	if(args[0] !== "fm" && args[0].startsWith("fm")){
 		let firstElement = args[0];