diff --git a/src/bot.ts b/src/bot.ts
index 16d72dc8ed15418bc1a23b4d9ce12bcf36d28023..3422880637d950d6ab4e19a1803de1a8561b7f00 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -283,7 +283,7 @@ export class DiscordBot {
 
   private HandleMentions(body: string, members: Discord.GuildMember[]): string {
     for (const member of members) {
-      body = body.replace(new RegExp(escapeStringRegexp(member.displayName), "g"), `<@!${member.id}>`);
+      body = body.replace(new RegExp(`(^| |\\t)${escapeStringRegexp(member.displayName)}` , "mg"), ` <@!${member.id}>`);
     }
     return body;
   }