diff --git a/MatchManagerSuite/MatchManagerCore.php b/MatchManagerSuite/MatchManagerCore.php
index d04650a..a32aacc 100644
--- a/MatchManagerSuite/MatchManagerCore.php
+++ b/MatchManagerSuite/MatchManagerCore.php
@@ -1551,7 +1551,8 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
 					//
 					$this->preendroundscore = array();
 					if (!$this->pauseon && !$this->skipround) {
-						if ($this->currentgmbase != "Cup" || ($this->currentgmbase == "Cup" && isset($atleastonefinished) && $atleastonefinished)) { // Round is skipped if no one finishes only in cup mode
+						if ($this->currentgmbase != "Cup" || ($this->currentgmbase == "Cup" && count($this->currentscore) > 0 && $this->currentscore[0][4] > 0)) { // Round is skipped if no one finishes only in cup mode
+							Logger::log("Round not counted because no one finished");
 							$this->nbrounds++;
 						}
 					}