diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
index 2cdc7912..2d175dfe 100644
--- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
+++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
@@ -379,7 +379,7 @@
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
+      <Text>1)</Text>
       <Reflection Enabled="false" />
     </Text>
     <Text Name="TextRoundPlayer">
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
index c9b72e6a..3539f737 100644
--- a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
+++ b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
@@ -379,7 +379,7 @@
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
+      <Text>1)</Text>
       <Reflection Enabled="false" />
     </Text>
     <Text Name="TextRoundPlayer">
diff --git a/PartyModes/PartyModeChallenge/CPartyScreenChallengeMain.cs b/PartyModes/PartyModeChallenge/CPartyScreenChallengeMain.cs
index 4785c32d..9b73f417 100644
--- a/PartyModes/PartyModeChallenge/CPartyScreenChallengeMain.cs
+++ b/PartyModes/PartyModeChallenge/CPartyScreenChallengeMain.cs
@@ -431,8 +431,6 @@ namespace VocaluxeLib.PartyModes.Challenge
 
         private void _BuildRoundsTable()
         {
-            if (_RoundsTable.Count == 0)
-                return;
             _RoundsTableScrollArea = new SRectF();
 
             const int numPlayerInOneRow = 3;
@@ -441,14 +439,14 @@ namespace VocaluxeLib.PartyModes.Challenge
             if (_NumRoundsVisible > _GameState.Combs.Count)
                 _NumRoundsVisible = _GameState.Combs.Count;
 
-            float numberX = _RoundsTable[0].Number.X;
-            float numberY = _RoundsTable[0].Number.Y;
+            float numberX = _Texts[_TextRoundNumber].X;
+            float numberY = _Texts[_TextRoundNumber].Y;
 
             _RoundsTableScrollArea.X = numberX;
             _RoundsTableScrollArea.Y = numberY;
-            _RoundsTableScrollArea.W = CBase.Settings.GetRenderW() - _RoundsTable[0].Number.X - 20;
+            _RoundsTableScrollArea.W = CBase.Settings.GetRenderW() - _Texts[_TextRoundNumber].X - 20;
 
-            float delta = _RoundsTable[0].Number.Rect.H;
+            float delta = _Texts[_TextRoundNumber].Rect.H;
 
             //Update statics and texts for rounds
             foreach (CRoundsTableRow roundRow in _RoundsTable)
@@ -481,7 +479,7 @@ namespace VocaluxeLib.PartyModes.Challenge
                         roundRow.TextScores[column].Y = numberY + delta;
                         roundRow.TextScores[column].MaxWidth = maxw;
                     }
-                    numberY = numberY + 2 * delta;
+                    numberY = numberY + 2*delta;
                 }
                 numberY = numberY + delta / 2;
             }
diff --git a/PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyMain.cs b/PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyMain.cs
index b1f798a0..ddc1230a 100644
--- a/PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyMain.cs
+++ b/PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyMain.cs
@@ -431,8 +431,6 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
 
         private void _BuildRoundsTable()
         {
-            if (_RoundsTable.Count == 0)
-                return;
             _RoundsTableScrollArea = new SRectF();
 
             const int numPlayerInOneRow = 3;
@@ -441,14 +439,14 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
             if (_NumRoundsVisible > _GameState.Combs.Count)
                 _NumRoundsVisible = _GameState.Combs.Count;
 
-            float numberX = _RoundsTable[0].Number.X;
-            float numberY = _RoundsTable[0].Number.Y;
+            float numberX = _Texts[_TextRoundNumber].X;
+            float numberY = _Texts[_TextRoundNumber].Y;
 
             _RoundsTableScrollArea.X = numberX;
             _RoundsTableScrollArea.Y = numberY;
-            _RoundsTableScrollArea.W = CBase.Settings.GetRenderW() - _RoundsTable[0].Number.X - 20;
+            _RoundsTableScrollArea.W = CBase.Settings.GetRenderW() - _Texts[_TextRoundNumber].X - 20;
 
-            float delta = _RoundsTable[0].Number.Rect.H;
+            float delta = _Texts[_TextRoundNumber].Rect.H;
 
             //Update statics and texts for rounds
             foreach (CRoundsTableRow roundRow in _RoundsTable)