diff --git a/modules/report/report.js b/modules/report/report.js
index 14571d6..d34d2ff 100644
--- a/modules/report/report.js
+++ b/modules/report/report.js
@@ -140,7 +140,7 @@ var report = function(dbot) {
                             cChan + "\u000f";
                     }
 
-                    message = message.replace(/ @([\d\w\s*|-]+?) /g, " " + colours['nicks'] +
+                    message = message.replace(/ @([\d\w\s*|-]+?)( |$)/g, " " + colours['nicks'] +
                         "@$1\u000f ");
                 }