diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index b56f9a106b..e8a91e4001 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -11,7 +11,7 @@ using osu.Framework.Lists;
 namespace osu.Game.Beatmaps.ControlPoints
 {
     [Serializable]
-    public class ControlPointInfo : ICloneable
+    public class ControlPointInfo
     {
         /// <summary>
         /// All control points grouped by time.
@@ -298,7 +298,7 @@ namespace osu.Game.Beatmaps.ControlPoints
             }
         }
 
-        public object Clone()
+        public ControlPointInfo CreateCopy()
         {
             var controlPointInfo = new ControlPointInfo();
 
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 06b5913b18..8688017887 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Beatmaps
                 // Convert
                 IBeatmap converted = converter.Convert(cancellationSource.Token);
 
-                converted.ControlPointInfo = (ControlPointInfo)converted.ControlPointInfo.Clone();
+                converted.ControlPointInfo = converted.ControlPointInfo.CreateCopy();
 
                 // Apply conversion mods to the result
                 foreach (var mod in mods.OfType<IApplicableAfterBeatmapConversion>())