diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
index 8b17964..2cb8180 100644
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -351,17 +351,22 @@ enum plugin_status plugin_start(const void* parameter)
     do {
         int ret=0;
         done=true;
-        for (i=0; done && i<settings.nr_timers; i++) {
+        i = nr;
+        do {
             if (!timer_holder[i].hidden)
-                done=false;
-        }
+            {
+                nr = i;
+                done = false;
+                break;
+            }
+            if (++i == settings.nr_timers)
+                i = 0;
+        } while (i != nr);
+
         if (done) {
             return PLUGIN_OK;
         }
-        if (!timer_holder[nr].hidden) {
-            done=false;
-            ret=run_timer(nr);
-        }
+        ret = run_timer(nr);
         switch (ret) {
             case -1: /* exit */
                 done=true;
@@ -506,7 +511,7 @@ static int run_timer(int nr)
                     done=true;
                 } else if (ret==-2) {
                 } else if (ret==0) {
-                     /* delete timer */
+                     /* delete player */
                     timer_holder[nr].hidden=true;
                     retval=1;
                     done=true;