diff --git a/src/channel.c b/src/channel.c
index 41ecd5453..9637d4042 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -2551,11 +2551,8 @@ static void sub1_from_channel(chptr)
 	Ban *ban;
 	Link *lp;
 
-        /* Bad. Bad. Bad. chptr->users is unsigned
-         * someone doesn't remember what -- does when
-         * preceding a variable.
-        if (--chptr->users <= 0) */
-        if (chptr->users-- == 0)
+        /* if (--chptr->users <= 0) */
+        if (chptr->users == 0 || --chptr->users == 0)
 	{
 		/*
 		 * Now, find all invite links from channel structure