diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
index b5e31bc5f5..5d66888916 100644
--- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
@@ -40,7 +40,7 @@ public override void Reset()
                 {
                     StartTime = time,
                     Position = new Vector2(RNG.Next(0, 512), RNG.Next(0, 384)),
-                    NewCombo = (i + 1) % 4 == 0
+                    NewCombo = i % 4 == 0
                 });
 
                 time += 500;
diff --git a/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs
index 047d599784..e3d89ac6fc 100644
--- a/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs
@@ -48,12 +48,12 @@ public virtual void ApplyColours(Beatmap b)
                 new Color4(121,9,13, 255),
             };
 
-            int i = 0;
+            int i = -1;
 
             foreach (HitObject h in b.HitObjects)
             {
-                h.Colour = colours[i];
                 if (h.NewCombo) i = (i + 1) % colours.Count;
+                h.Colour = colours[i];
             }
         }
     }