diff --git a/modules/core/m_mode.c b/modules/core/m_mode.c
index 99f180de..64924ef2 100644
--- a/modules/core/m_mode.c
+++ b/modules/core/m_mode.c
@@ -375,7 +375,10 @@ ms_bmask(struct Client *client_p, struct Client *source_p, int parc, const char
 		{
 			*forward++ = '\0';
 			if(*forward == '\0')
-				tlen--, forward = NULL;
+			{
+				tlen--;
+				forward = NULL;
+			}
 			else
 				possibly_remove_lower_forward(fakesource_p,
 						mems, chptr, banlist,