diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 112fcb1a30..2f6b5c7e68 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -45,6 +45,12 @@ namespace osu.Game.Rulesets.Osu.Objects
             set { Curve.Distance = value; }
         }
 
+        /// <summary>
+        /// The position of the cursor at the point of completion of this <see cref="OsuHitObject"/>.
+        /// This is set and used by difficulty calculation.
+        /// </summary>
+        internal Vector2? CursorPosition;
+
         public List<SampleInfoList> RepeatSamples { get; set; } = new List<SampleInfoList>();
         public int RepeatCount { get; set; } = 1;
 
diff --git a/osu.Game.Rulesets.Osu/OsuDifficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/OsuDifficulty/Preprocessing/OsuDifficultyHitObject.cs
index 05738f1a7d..48f9bcce32 100644
--- a/osu.Game.Rulesets.Osu/OsuDifficulty/Preprocessing/OsuDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Osu/OsuDifficulty/Preprocessing/OsuDifficultyHitObject.cs
@@ -2,6 +2,8 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
+using System.Linq;
+using OpenTK;
 using osu.Game.Rulesets.Osu.Objects;
 
 namespace osu.Game.Rulesets.Osu.OsuDifficulty.Preprocessing
@@ -61,7 +63,39 @@ namespace osu.Game.Rulesets.Osu.OsuDifficulty.Preprocessing
                 scalingFactor *= 1 + smallCircleBonus;
             }
 
-            Distance = (t[0].StackedPosition - t[1].StackedPosition).Length * scalingFactor;
+            Vector2 lastCursorPosition = t[1].StackedPosition;
+
+            var lastSlider = t[1] as Slider;
+            if (lastSlider != null)
+            {
+                if (lastSlider.CursorPosition == null)
+                {
+                    float approxFollowCircleRadius = (float)(lastSlider.Radius * scalingFactor * 3);
+
+                    var computeVertex = new Action<double>(t =>
+                    {
+                        var diff = lastSlider.PositionAt(t) - lastCursorPosition;
+                        float dist = diff.Length;
+
+                        if (dist > approxFollowCircleRadius)
+                        {
+                            // The cursor would be outside the follow circle, we need to move it
+                            diff.Normalize(); // Obtain direction of diff
+                            dist -= approxFollowCircleRadius;
+                            lastCursorPosition += diff * dist;
+                        }
+                    });
+
+                    var scoringTimes = lastSlider.Ticks.Select(t => t.StartTime).Concat(lastSlider.RepeatPoints.Select(r => r.StartTime)).OrderBy(t => t);
+                    foreach (var time in scoringTimes)
+                        computeVertex(time);
+                    computeVertex(lastSlider.EndTime);
+
+                    lastSlider.CursorPosition = lastCursorPosition;
+                }
+            }
+
+            Distance = (BaseObject.StackedPosition - lastCursorPosition).Length * scalingFactor;
         }
 
         private void setTimingValues()