diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp
index a8252c8c5..a399ecece 100644
--- a/modules/protocol/bahamut.cpp
+++ b/modules/protocol/bahamut.cpp
@@ -328,8 +328,12 @@ struct IRCDMessageMode : IRCDMessage
 			}
 			catch (const ConvertException &) { }
 
+			Anope::string modes = params[2];
+			for (unsigned int i = 3; i < params.size(); ++i)
+				modes += " " + params[i];
+
 			if (c)
-				c->SetModesInternal(source, params[2], ts);
+				c->SetModesInternal(source, modes, ts);
 		}
 		else
 		{