diff --git a/app/lib/App/Teamtable/Team.php b/app/lib/App/Teamtable/Team.php
index b63362a..4feb832 100644
--- a/app/lib/App/Teamtable/Team.php
+++ b/app/lib/App/Teamtable/Team.php
@@ -101,7 +101,7 @@ class Team
 
     public function setRounds(int $rounds): Self
     {
-        if ($rounds > 9999)
+        if ($rounds > 99999)
         {
             throw new InvalidArgumentException("Too many rounds!");
         }
diff --git a/app/model/BatonReader.php b/app/model/BatonReader.php
index b0b48b8..4c36b8c 100644
--- a/app/model/BatonReader.php
+++ b/app/model/BatonReader.php
@@ -60,7 +60,7 @@ class BatonReader
             return 2;
         }
 
-        $team->rounds += 1;
+        $team->setRounds($team->rounds + 1);
         $this->team_mapper->update($team);
 
         if ($team->best_time === NULL)