diff --git a/Source/CommandManager.py b/Source/CommandManager.py
index 7e42d86..f40bcf1 100644
--- a/Source/CommandManager.py
+++ b/Source/CommandManager.py
@@ -76,7 +76,7 @@ def handle_command(self, message):
                                 command_room = each_room
                                 break
 
-                        self.run_command(command(self, message, command_room, args, usage_index))
+                        self.run_command(command(self, command_room, message, args, usage_index))
                         return
 
     def cleanup_finished_commands(self):
diff --git a/setup.py b/setup.py
index 077f6b2..5f1006c 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 setup (
     name = "BotpySE",
     packages = ["BotpySE"],
-    version = "0.2.0",
+    version = "0.2.1",
     description = "A python framework to create chatbots on the StackExchange network.",
     author = "Ashish Ahuja",
     author_email = "ashish.ahuja@sobotics.org",