diff --git a/cannon.py b/cannon.py
index 0911245..3c9191c 100644
--- a/cannon.py
+++ b/cannon.py
@@ -10,7 +10,7 @@ def __init__(self):
         self.firecount = {}
 
     def onChanMsg(self, context, user, channel, targetprefix, msg):
-        matches = re.findall("^!fire\\s+(.*)$", msg)
+        matches = re.findall("^!fire\\s+(\\S+)", msg)
         if matches:
             nickname = matches[0]
             if any([nickname.lower() == usr.nick.lower() for usr in channel.users]):