         msg.send "Invalid command, say \"aotw help\" for help"
 
     robot.hear /^\s*aotw (.*)/i, (msg) ->
-        cmd = msg.match[1]
+        cmd = msg.match[1].split(" ")[0]
         switch cmd
             when "current" then checkMessage msg, aotw.printCurrentAotw
             when "help" then aotw.printHelp msg

            msg.send "No current album of the week"

    printHistory: (msg) ->
        if msg.match[1] != ""
            limit = msg.match[2]
        else
            limit = 9999


            msg.send "Invalid nomination: missing url"

    printNominations: (msg) ->
        if msg.match[1] != "nominations"
            limit = msg.match[1].split(" ")[1]
        else
            limit = 9999

        if @storage.nominations && @storage.nominations.length > 0
            msg.send "Total of #{@storage.nominations.length} nominations"
            i = 0
            while i < @storage.nominations.length && i < limit
                nomination = @storage.nominations[i]
                msg.send "#{i + 1} - #{nomination["user"]} - #{nomination["url"]}"
                i++
