diff --git a/src/kike.c b/src/kike.c
index 7632a35..7278363 100644
--- a/src/kike.c
+++ b/src/kike.c
@@ -612,11 +612,7 @@ irc_send_lusers (struct client *c)
 			n_opers++;
 	}
 
-	int n_channels = 0;
-	struct str_map_iter iter;
-	str_map_iter_init (&iter, &c->ctx->channels);
-	while (str_map_iter_next (&iter))
-		n_channels++;
+	int n_channels = c->ctx->channels.len;
 
 	irc_send_reply (c, IRC_RPL_LUSERCLIENT,
 		n_users, n_services, 1 /* servers total */);
@@ -753,13 +749,9 @@ static void
 irc_handle_lusers (const struct irc_message *msg, struct client *c)
 {
 	if (msg->params.len > 1 && !irc_is_this_me (c->ctx, msg->params.vector[1]))
-	{
 		irc_send_reply (c, IRC_ERR_NOSUCHSERVER, msg->params.vector[1]);
-		return;
-	}
 	else
 		irc_send_lusers (c);
-
 }
 
 static void