diff --git a/src/itdelatrisu/opsu/objects/curves/LinearBezier.java b/src/itdelatrisu/opsu/objects/curves/LinearBezier.java
index 2f1d01a1..5f3dccda 100644
--- a/src/itdelatrisu/opsu/objects/curves/LinearBezier.java
+++ b/src/itdelatrisu/opsu/objects/curves/LinearBezier.java
@@ -109,8 +109,13 @@ public class LinearBezier extends Curve {
 					if (iter.hasNext()) {
 						curBezier = iter.next();
 						curPoint = 0;
-					} else
+					} else {
 						curPoint = curBezier.points() - 1;
+						if(lastDistanceAt == distanceAt){
+							//out of points even though we haven't reached the preferred distance.
+							break;
+						}
+					}
 				}
 			}
 			Vec2f thisCurve = curBezier.getCurve()[curPoint];