diff --git a/osu-framework b/osu-framework
index 6134dafccb..067fdb8f5b 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 6134dafccb3368dac96d837537325c04b89fb8ee
+Subproject commit 067fdb8f5b0594be1cd30e6bbd43f2ea749904ec
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 26e6585fb9..c8e5913fd2 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -192,7 +192,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             Size = BaseSize * Parent.RelativeChildSize;
 
             // Make the swell stop at the hit target
-            X = (float)Math.Max(Time.Current, HitObject.StartTime);
+            X = Math.Max(0, X);
 
             double t = Math.Min(HitObject.StartTime, Time.Current);
             if (t == HitObject.StartTime && !hasStarted)
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 36b885c84b..4011e7ffd1 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -29,9 +29,12 @@ namespace osu.Game.Rulesets.UI.Scrolling
             RelativeSizeAxes = Axes.Both;
         }
 
-        protected override void UpdateAfterChildren()
+        protected override void UpdateAfterChildrenLife()
         {
-            base.UpdateAfterChildren();
+            base.UpdateAfterChildrenLife();
+
+            // We need to calculate this as soon as possible so that hitobjects
+            // get the final say in their positions
 
             var currentMultiplier = controlPointAt(Time.Current);