diff --git a/src/k_tally.cpp b/src/k_tally.cpp
index 359ffb657..076047afa 100644
--- a/src/k_tally.cpp
+++ b/src/k_tally.cpp
@@ -330,14 +330,11 @@ void level_tally_t::Init(player_t *player)
 		if ((gametypes[gt]->rules & GTR_CIRCUIT) == GTR_CIRCUIT)
 		{
 			laps = player->lapPoints;
+			totalLaps = K_RaceLapCount(gamemap-1);
 
-			if (inDuel == true)
+			if (inDuel == false)
 			{
-				totalLaps = K_RaceLapCount(gamemap);
-			}
-			else
-			{
-				totalLaps = K_RaceLapCount(gamemap) * 2;
+				totalLaps *= 2;
 			}
 		}