diff --git a/lib/ircb.js b/lib/ircb.js
index <HASH>..<HASH> 100644
--- a/lib/ircb.js
+++ b/lib/ircb.js
@@ -224,10 +224,10 @@ IRCb.prototype.names = function (channel, cb) {
   });
 };
 
-IRCb.prototype.whois = function (nickname, cb) {
+IRCb.prototype.whois = function (nick, cb) {
   var self = this;
 
-  self.write('WHOIS ' + nickname, function (err) {
+  self.write('WHOIS ' + nick, function (err) {
     if (err) {
       return cb(err);
     }
@@ -237,8 +237,10 @@ IRCb.prototype.whois = function (nickname, cb) {
         return cb(err);
       }
 
-      cb(null, whois);
-      self.removeListener('whois', onWhois);
+      if (nick === whois.nick) {
+        cb(null, whois);
+        self.removeListener('whois', onWhois);
+      }
     });
   });
 };
[fix] Filter by nickname to avoid confusing replies