diff --git a/src/main/java/eu/crushedpixel/replaymod/events/handlers/RecordingHandler.java b/src/main/java/eu/crushedpixel/replaymod/events/handlers/RecordingHandler.java
index ff648e01..a6a39f30 100755
--- a/src/main/java/eu/crushedpixel/replaymod/events/handlers/RecordingHandler.java
+++ b/src/main/java/eu/crushedpixel/replaymod/events/handlers/RecordingHandler.java
@@ -1,6 +1,7 @@
 package eu.crushedpixel.replaymod.events.handlers;
 
 import eu.crushedpixel.replaymod.recording.ConnectionEventHandler;
+import eu.crushedpixel.replaymod.utils.Objects;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import net.minecraft.client.Minecraft;
@@ -26,8 +27,6 @@ import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent.PlayerTickEvent;
 
-import java.util.Objects;
-
 public class RecordingHandler {
 
     public static final int entityID = Integer.MIN_VALUE + 9001;
diff --git a/src/main/java/eu/crushedpixel/replaymod/interpolation/KeyframeList.java b/src/main/java/eu/crushedpixel/replaymod/interpolation/KeyframeList.java
index 2f99d022..5871bad1 100644
--- a/src/main/java/eu/crushedpixel/replaymod/interpolation/KeyframeList.java
+++ b/src/main/java/eu/crushedpixel/replaymod/interpolation/KeyframeList.java
@@ -1,10 +1,11 @@
 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>> {
@@ -44,7 +45,7 @@ public class KeyframeList<K extends KeyframeValue> extends ArrayList<Keyframe<K>
 
     public void sort() {
         previousCallLinear = null;
-        sort(KEYFRAME_COMPARATOR);
+        Collections.sort(this, KEYFRAME_COMPARATOR);
     }
 
     /**
diff --git a/src/main/java/eu/crushedpixel/replaymod/utils/Objects.java b/src/main/java/eu/crushedpixel/replaymod/utils/Objects.java
new file mode 100644
index 00000000..20a65beb
--- /dev/null
+++ b/src/main/java/eu/crushedpixel/replaymod/utils/Objects.java
@@ -0,0 +1,7 @@
+package eu.crushedpixel.replaymod.utils;
+
+public class Objects {
+    public static boolean equals(Object a, Object b) {
+        return a == b || a != null && a.equals(b);
+    }
+}