diff --git a/parser_eggdrop.php b/parser_eggdrop.php
index 1dd39e46..0f6c5aef 100644
--- a/parser_eggdrop.php
+++ b/parser_eggdrop.php
@@ -76,8 +76,8 @@ protected function parse_line($line)
 		/**
 		 * "Mode" lines.
 		 */
-		} elseif (preg_match('/^\[(?<time>\d{2}:\d{2}(:\d{2})?)\] [#&!+]\S+: mode change \'(?<modes>[-+][ov]+([-+][ov]+)?) (?<nicks>\S+( \S+)*)\' by (?<nick>\S+?)(!(\S+)?)?$/', $line, $matches)) {
-			$nicks = explode(' ', $matches['nicks']);
+		} elseif (preg_match('/^\[(?<time>\d{2}:\d{2}(:\d{2})?)\] [#&!+]\S+: mode change \'(?<modes>[-+][ov]+([-+][ov]+)?) (?<nicks_undergoing>\S+( \S+)*)\' by (?<nick_performing>\S+?)(!(\S+)?)?$/', $line, $matches)) {
+			$nicks_undergoing = explode(' ', $matches['nicks_undergoing']);
 			$modenum = 0;
 
 			for ($i = 0, $j = strlen($matches['modes']); $i < $j; $i++) {
@@ -86,7 +86,7 @@ protected function parse_line($line)
 				if ($mode == '-' || $mode == '+') {
 					$modesign = $mode;
 				} else {
-					$this->set_mode($this->date.' '.$matches['time'], $matches['nick'], $nicks[$modenum], $modesign.$mode);
+					$this->set_mode($this->date.' '.$matches['time'], $matches['nick_performing'], $nicks_undergoing[$modenum], $modesign.$mode);
 					$modenum++;
 				}
 			}
diff --git a/parser_hexchat.php b/parser_hexchat.php
index 3fa3d62e..3fedb37f 100644
--- a/parser_hexchat.php
+++ b/parser_hexchat.php
@@ -28,7 +28,7 @@
  * | Part	| * NICK (HOST) has left CHAN (MSG)			| Part message may be absent, or empty due to normalization.
  * | Quit	| * NICK has quit (MSG)					| Quit message may be empty due to normalization.
  * | Mode	| * NICK gives channel operator status to NICK NICK	| Only check for ops (channel operator status) and voices.
- * | Mode	| * NICK removes voice from NICK NICK			|
+ * | Mode	| * NICK removes voice from NICK NICK			| "
  * | Topic	| * NICK has changed the topic to: MSG			| Skip empty topics.
  * | Kick	| * NICK has kicked NICK from CHAN (MSG)		| Kick message may be empty due to normalization.
  * +------------+-------------------------------------------------------+->
@@ -37,7 +37,7 @@
  * - normalize_line() scrubs all lines before passing them on to parse_line().
  * - The way HexChat logs actions is pretty dumb, we can spoof nearly all other line types with our actions. Even non-chat messages are logged with the same
  *   syntax. For this reason we won't parse for actions.
- * - Given that nicks can't contain "<", ">" or ":" the order of the regular expressions below is irrelevant (current order aims for best performance).
+ * - The order of the regular expressions below is irrelevant (current order aims for best performance).
  * - The most common channel prefixes are "#&!+".
  */
 final class parser_hexchat extends parser
diff --git a/parser_irssi.php b/parser_irssi.php
index 00f1bb48..3e79978d 100644
--- a/parser_irssi.php
+++ b/parser_irssi.php
@@ -37,11 +37,12 @@
  *
  * Notes:
  * - normalize_line() scrubs all lines before passing them on to parse_line().
- * - The order of the regular expressions below is irrelevant (current order aims for best performance).
+ * - Given that nicks can't contain "/" or any of the channel prefixes, the order of the regular expressions below is irrelevant (current order aims for best
+ *   performance).
  * - We have to be mindful that nicks can contain "[" and "]".
  * - The most common channel prefixes are "#&!+" and the most common nick prefixes are "~&@%+!*". If one of the nick prefixes slips through then validate_nick()
  *   will fail.
- * - Irssi may log multiple "performing" nicks separated by commas. We use only the first one.
+ * - Irssi may log multiple "performing" nicks in "mode" lines separated by commas. We use only the first one.
  * - In certain cases $matches[] won't contain index items if these optionally appear at the end of a line. We use empty() to check whether an index item is
  *   both set and has a value.
  */
@@ -73,8 +74,8 @@ protected function parse_line($line)
 		/**
 		 * "Mode" lines.
 		 */
-		} elseif (preg_match('/^(?<time>\d{2}:\d{2}(:\d{2})?) -!- (ServerMode|mode)\/[#&!+]\S+ \[(?<modes>[-+][ov]+([-+][ov]+)?) (?<nicks>\S+( \S+)*)\] by (?<nick>\S+)(, \S+)*$/', $line, $matches)) {
-			$nicks = explode(' ', $matches['nicks']);
+		} elseif (preg_match('/^(?<time>\d{2}:\d{2}(:\d{2})?) -!- (ServerMode|mode)\/[#&!+]\S+ \[(?<modes>[-+][ov]+([-+][ov]+)?) (?<nicks_undergoing>\S+( \S+)*)\] by (?<nick_performing>\S+)(, \S+)*$/', $line, $matches)) {
+			$nicks_undergoing = explode(' ', $matches['nicks_undergoing']);
 			$modenum = 0;
 
 			for ($i = 0, $j = strlen($matches['modes']); $i < $j; $i++) {
@@ -83,7 +84,7 @@ protected function parse_line($line)
 				if ($mode == '-' || $mode == '+') {
 					$modesign = $mode;
 				} else {
-					$this->set_mode($this->date.' '.$matches['time'], $matches['nick'], $nicks[$modenum], $modesign.$mode);
+					$this->set_mode($this->date.' '.$matches['time'], $matches['nick_performing'], $nicks_undergoing[$modenum], $modesign.$mode);
 					$modenum++;
 				}
 			}
diff --git a/parser_mirc6.php b/parser_mirc6.php
index 986c0072..8f8dca20 100644
--- a/parser_mirc6.php
+++ b/parser_mirc6.php
@@ -72,8 +72,8 @@ protected function parse_line($line)
 		/**
 		 * "Mode" lines.
 		 */
-		} elseif (preg_match('/^\[(?<time>\d{2}:\d{2}(:\d{2})?)\] \* (?<nick>\S+) sets mode: (?<modes>[-+][ov]+([-+][ov]+)?) (?<nicks>\S+( \S+)*)$/', $line, $matches)) {
-			$nicks = explode(' ', $matches['nicks']);
+		} elseif (preg_match('/^\[(?<time>\d{2}:\d{2}(:\d{2})?)\] \* (?<nick_performing>\S+) sets mode: (?<modes>[-+][ov]+([-+][ov]+)?) (?<nicks_undergoing>\S+( \S+)*)$/', $line, $matches)) {
+			$nicks_undergoing = explode(' ', $matches['nicks_undergoing']);
 			$modenum = 0;
 
 			for ($i = 0, $j = strlen($matches['modes']); $i < $j; $i++) {
@@ -82,7 +82,7 @@ protected function parse_line($line)
 				if ($mode == '-' || $mode == '+') {
 					$modesign = $mode;
 				} else {
-					$this->set_mode($this->date.' '.$matches['time'], $matches['nick'], $nicks[$modenum], $modesign.$mode);
+					$this->set_mode($this->date.' '.$matches['time'], $matches['nick_performing'], $nicks_undergoing[$modenum], $modesign.$mode);
 					$modenum++;
 				}
 			}
diff --git a/parser_muh2.php b/parser_muh2.php
index de4934cc..d4376d84 100644
--- a/parser_muh2.php
+++ b/parser_muh2.php
@@ -68,8 +68,8 @@ protected function parse_line($line)
 		/**
 		 * "Mode" lines.
 		 */
-		} elseif (preg_match('/^\[(?<time>\d{2}:\d{2}(:\d{2})?)\] \*\*\* (?<nick>\S+) sets mode: (?<modes>[-+][ov]+([-+][ov]+)?) (?<nicks>\S+( \S+)*)$/', $line, $matches)) {
-			$nicks = explode(' ', $matches['nicks']);
+		} elseif (preg_match('/^\[(?<time>\d{2}:\d{2}(:\d{2})?)\] \*\*\* (?<nick_performing>\S+) sets mode: (?<modes>[-+][ov]+([-+][ov]+)?) (?<nicks_undergoing>\S+( \S+)*)$/', $line, $matches)) {
+			$nicks_undergoing = explode(' ', $matches['nicks_undergoing']);
 			$modenum = 0;
 
 			for ($i = 0, $j = strlen($matches['modes']); $i < $j; $i++) {
@@ -78,7 +78,7 @@ protected function parse_line($line)
 				if ($mode == '-' || $mode == '+') {
 					$modesign = $mode;
 				} else {
-					$this->set_mode($this->date.' '.$matches['time'], $matches['nick'], $nicks[$modenum], $modesign.$mode);
+					$this->set_mode($this->date.' '.$matches['time'], $matches['nick_performing'], $nicks_undergoing[$modenum], $modesign.$mode);
 					$modenum++;
 				}
 			}
diff --git a/parser_supybot.php b/parser_supybot.php
index c77696ed..283cde99 100644
--- a/parser_supybot.php
+++ b/parser_supybot.php
@@ -69,8 +69,8 @@ protected function parse_line($line)
 		/**
 		 * "Mode" lines.
 		 */
-		} elseif (preg_match('/^\d{4}-\d{2}-\d{2}T(?<time>\d{2}:\d{2}:\d{2}) \*\*\* (?<nick>\S+) sets mode: (?<modes>[-+][ov]+([-+][ov]+)?) (?<nicks>\S+( \S+)*)$/', $line, $matches)) {
-			$nicks = explode(' ', $matches['nicks']);
+		} elseif (preg_match('/^\d{4}-\d{2}-\d{2}T(?<time>\d{2}:\d{2}:\d{2}) \*\*\* (?<nick_performing>\S+) sets mode: (?<modes>[-+][ov]+([-+][ov]+)?) (?<nicks_undergoing>\S+( \S+)*)$/', $line, $matches)) {
+			$nicks_undergoing = explode(' ', $matches['nicks_undergoing']);
 			$modenum = 0;
 
 			for ($i = 0, $j = strlen($matches['modes']); $i < $j; $i++) {
@@ -79,7 +79,7 @@ protected function parse_line($line)
 				if ($mode == '-' || $mode == '+') {
 					$modesign = $mode;
 				} else {
-					$this->set_mode($this->date.' '.$matches['time'], $matches['nick'], $nicks[$modenum], $modesign.$mode);
+					$this->set_mode($this->date.' '.$matches['time'], $matches['nick_performing'], $nicks_undergoing[$modenum], $modesign.$mode);
 					$modenum++;
 				}
 			}