diff --git a/src/main/java/eu/crushedpixel/replaymod/interpolation/KeyframeList.java b/src/main/java/eu/crushedpixel/replaymod/interpolation/KeyframeList.java
index 270e4b52..2f99d022 100644
--- a/src/main/java/eu/crushedpixel/replaymod/interpolation/KeyframeList.java
+++ b/src/main/java/eu/crushedpixel/replaymod/interpolation/KeyframeList.java
@@ -1,11 +1,10 @@
 package eu.crushedpixel.replaymod.interpolation;
 
-import eu.crushedpixel.replaymod.holders.AdvancedPosition;
 import eu.crushedpixel.replaymod.holders.Keyframe;
 import eu.crushedpixel.replaymod.holders.KeyframeComparator;
+import eu.crushedpixel.replaymod.holders.AdvancedPosition;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 public class KeyframeList<K extends KeyframeValue> extends ArrayList<Keyframe<K>> {
@@ -45,7 +44,7 @@ public class KeyframeList<K extends KeyframeValue> extends ArrayList<Keyframe<K>
 
     public void sort() {
         previousCallLinear = null;
-        Collections.sort(this, KEYFRAME_COMPARATOR);
+        sort(KEYFRAME_COMPARATOR);
     }
 
     /**
@@ -139,8 +138,6 @@ public class KeyframeList<K extends KeyframeValue> extends ArrayList<Keyframe<K>
     }
 
     public K getInterpolatedValueForPathPosition(float pathPosition, boolean linear) {
-        //as every implementation of KeyframeValue returns a new instance of itself, this warning can be ignored
-        @SuppressWarnings("unchecked")
         K toApply = (K)first().getValue().newInstance();
 
         if(previousCallLinear != (Boolean)linear) {