diff --git a/irc.lamb b/irc.lamb
index 4da4384..a0b7868 100644
--- a/irc.lamb
+++ b/irc.lamb
@@ -202,10 +202,11 @@ handleCommand(s, user, "JOIN", [chan]) -> do
 	s
 end.
 
-handleCommand(s, user, "PRIVMSG", [chan, msg]) -> do
+handleCommand(s, user, "PRIVMSG", [recipient, msg]) -> do
 	nick = ircnick(user);
-	putstrln(chan + " " + "<" + nick + "> " + msg);
-	handleMessage(s, nick, chan, msg)
+	target = if recipient != NICK then recipient else nick;
+	putstrln(target + " " + "<" + nick + "> " + msg);
+	handleMessage(s, nick, target, msg)
 end.
 
 -- nick list
@@ -268,4 +269,4 @@ initialState = (loadFactoids(),).
 putstrln("beginning mainloop").
 loop(mainloop, initialState).
 fclose(sock).
-putstrln("done").
\ No newline at end of file
+putstrln("done").