diff --git a/ircclient.cpp b/ircclient.cpp
index 248d48a..bf44937 100644
--- a/ircclient.cpp
+++ b/ircclient.cpp
@@ -387,7 +387,7 @@ void IrcClient::process(const QString &message)
                 myCurrentNick = m_connectionData.altNick;
             }
 
-            if (userMsg.startsWith(myCurrentNick)) {
+            if (QRegularExpression("^"+myCurrentNick+"(:|,|!).*").match(userMsg).hasMatch()) {
                 userMsg.remove(0, myCurrentNick.size());
                 toTrigger(channel, nickname, userMsg);
             }