diff --git a/src/events/message.js b/src/events/message.js
index 3505c1c..f91dd7e 100644
--- a/src/events/message.js
+++ b/src/events/message.js
@@ -131,12 +131,20 @@ module.exports = async (client, message) => {
     };
   };
   
-  const prefixMention = new RegExp(`^<@!?${client.user.id}>( |)$`);
+  //const prefixMention = new RegExp(`^<@!?${client.user.id}>( |)$`);
+  const myMention = `<@&${client.user.id}>`;
+  const myMention2 = `<@!${client.user.id}>`;
 
-  if (message.content.match(prefixMention)) {
-    return message.channel.send(`Current prefix: \`${prefix}\``);
-  }
+  console.log(message.content);
 
+  if (message.content.startsWith(myMention) || message.content.startsWith(myMention2)) {
+    if(message.content.length > myMention.length + 1 && (message.content.substr(0, myMention.length + 1) == myMention + ' ' || message.content.substr(0, myMention2.length + 1) == myMention2 + ' ')) {
+      prefix = message.content.substr(0, myMention.length) + ' ';
+    } else {
+      return message.channel.send(`Current prefix: \`${prefix}\``);
+    };
+  };
+  
   if (message.content.indexOf(prefix) !== 0) return;
 
   const args = message.content.slice(prefix.length).trim().split(/ +/g);