diff --git a/botthread.c b/botthread.c
index 4a49d0c..72504f0 100644
--- a/botthread.c
+++ b/botthread.c
@@ -366,12 +366,16 @@
             tmpChans->count++;
             }
           else {
-            if ((tmpUser != tmpChans->nextUser) && (tmpChans->count == MAX_COUNT)) {
-              writeLog(0,"MAXCNT");
+            if (tmpUser == tmpChans->nextUser) {
+              if (tmpChans->count != MAX_COUNT) {
+                tmpChans->count = MAX_COUNT;
+                goto findUser;
+                }
+              }
+            else {
               tmpChans->count = MAX_COUNT;
               goto findUser;
               }
-            tmpChans->count = MAX_COUNT;
               
             /* Find A Random Song */
             getRandom: