diff --git a/init.lua b/init.lua
index 80554a3..5d2da2b 100644
--- a/init.lua
+++ b/init.lua
@@ -281,10 +281,10 @@ end
 handlers["333"] = function(o, prefix, me, channel, nick, time)
 	o:invoke("OnTopicInfo", channel, nick, tonumber(time))
 end
-
-handlers["KICK"] = function(o, prefix, channel, kicked, reason)
-	o:invoke("OnKick", channel, kicked, parsePrefix(prefix), reason)
-end
+
+handlers["KICK"] = function(o, prefix, channel, kicked, reason)
+	o:invoke("OnKick", channel, kicked, parsePrefix(prefix), reason)
+end
 
 --RPL_UMODEIS
 --To answer a query about a client's own mode, RPL_UMODEIS is sent back
@@ -293,10 +293,10 @@ handlers["221"] = function(o, prefix, modes)
 end
 
 --RPL_CHANNELMODEIS
---user seems to be just a repeat of the user's nick
+--The result from common irc servers differs from that defined by the rfc
 handlers["324"] = function(o, prefix, user, channel, modes)
-	o.invoke("OnChannelModeIs", user, channel, modes)
-end
+	o:invoke("OnChannelModeIs", user, channel, modes)
+end
 
 handlers["ERROR"] = function(o, prefix, message)
 	o:invoke("OnDisconnect", message, true)