diff --git a/jabber-bot/lib/jabber/bot.rb b/jabber-bot/lib/jabber/bot.rb
index 81a7c76..840c3bc 100644
--- a/jabber-bot/lib/jabber/bot.rb
+++ b/jabber-bot/lib/jabber/bot.rb
@@ -264,7 +264,7 @@ def parse_command(sender, message) #:nodoc:
           if command[:is_public] or is_master
             unless (message.strip =~ command[:regex]).nil?
               response = command[:callback].call(sender,
-                  message.sub(/^.+\s+/, ''))
+                  message.sub(/^.[^\s]+\s+/, ''))
          
               deliver(sender, response) unless response.nil?
               return