diff --git a/modules/uptime.py b/modules/uptime.py
index 09732cd..4631271 100755
--- a/modules/uptime.py
+++ b/modules/uptime.py
@@ -26,8 +26,8 @@ def uptime(bot, trigger):
 @commands('updick')
 def updick(bot, trigger):
 	""".updick - Returns the uptime of Fulvia, measured in dicks."""
-	if len(trigger.args) < 2:
-		if trigger.args[1] in bot.users:
+	if len(trigger.args) > 1:
+		if trigger.args[1] in bot.channels[trigger.channel].users:
 			d = defer.Deferred()
 			d.addCallback(idleTime, bot)
 			bot.memory["idle_callbacks"][trigger.args[1]] = d
@@ -40,10 +40,10 @@ def updick(bot, trigger):
 @commands('upwulf')
 def upwulf(bot, trigger):
 	""".upwulf - Returns the uptime of Fulvia, measured in Adalwulfs."""
-	if len(trigger.args) < 2:
-		if trigger.args[1] in bot.users:
+	if len(trigger.args) > 1:
+		if trigger.args[1] in bot.channels[trigger.channel].users:
 			d = defer.Deferred()
-			d.addCallback(idleTime, bot)
+			d.addCallback(idleTimeWulf, bot)
 			bot.memory["idle_callbacks"][trigger.args[1]] = d
 			bot.whois(trigger.args[1])
 	else: