diff --git a/src/Tournament.php b/src/Tournament.php
index b323b7c..aa29f5f 100644
--- a/src/Tournament.php
+++ b/src/Tournament.php
@@ -525,7 +525,7 @@ class Tournament
         foreach ($intpairingsWithBye as $key => $pairing) {
             $roundstoplay = (count($intpairingsWithBye)) - $curround;
             if (is_null($pairing->Opponent)) {
-                $intpairings[] = $player->calculatePointsForVirtualPlayer($key);
+                if($this->System == TournamentSystem::SWISS) $intpairings[] = $player->calculatePointsForVirtualPlayer($key);
             } else {
                 $intpairings[] = $pairing->Opponent->calculatePointsForTiebreaks();
                 if (array_search($pairing->Result, Constants::WON) !== false) {
@@ -730,7 +730,7 @@ class Tournament
                 }
             }
             if ($pairing->Result == Result::WON_BYE) {
-                $tiebreak += $player->calculatePointsForVirtualPlayer($key);
+                if($this->System == TournamentSystem::SWISS) $tiebreak += $player->calculatePointsForVirtualPlayer($key);
             }
         }