diff --git a/pyircbot/modules/PingResponder.py b/pyircbot/modules/PingResponder.py
index a73e3ba..09bd7c9 100755
--- a/pyircbot/modules/PingResponder.py
+++ b/pyircbot/modules/PingResponder.py
@@ -15,16 +15,29 @@ class PingResponder(ModuleBase):
     def __init__(self, bot, moduleName):
         ModuleBase.__init__(self, bot, moduleName);
         self.timer = PingRespondTimer(self)
-        self.hooks=[ModuleHook("PING", self.pingrespond)]
+        self.hooks=[
+            ModuleHook("PING", self.pingrespond),
+            ModuleHook("_RECV", self.resettimer)
+        ]
+
+
     def pingrespond(self, args, prefix, trailing):
         """Respond to the PING command"""
         # got a ping? send it right back
         self.bot.act_PONG(trailing)
         self.log.info("%s Responded to a ping: %s" % (self.bot.get_nick(), trailing))
+
+
+    def resettimer(self, msg):
+        """Resets the connection failure timer"""
         self.timer.reset()
+
+
     def ondisable(self):
         self.timer.disable()
 
+
+
 class PingRespondTimer(Thread):
     "Tracks last ping from server, and reconnects if over a threshold"
     def __init__(self, master):