diff --git a/consumer.py b/consumer.py
index 025757e..4a94c2c 100644
--- a/consumer.py
+++ b/consumer.py
@@ -124,7 +124,7 @@ class MessageConsumer:
                     self.srv._on_connect()
 
             elif msg.cmd == "PING":
-                self.srv.write("%s :%s" % ("PONG", msg.decode(msg.params[0])))
+                self.srv.write("%s :%s" % ("PONG", msg.params[0]))
 
             else:
                 for h in hm.get_hooks("in", msg.cmd, msg.qual):
diff --git a/message.py b/message.py
index b05a489..b222a76 100644
--- a/message.py
+++ b/message.py
@@ -91,7 +91,7 @@ class Message:
       self.topic = self.decode(self.params[1]).split(" ")
 
     else:
-      for i in range(0, len(self.params)-1):
+      for i in range(0, len(self.params)):
         self.params[i] = self.decode(self.params[i])