diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiKeyframeRepository.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiKeyframeRepository.java
index 07dfcc43..66a5a90e 100644
--- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiKeyframeRepository.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiKeyframeRepository.java
@@ -156,7 +156,7 @@ public class GuiKeyframeRepository extends GuiScreen implements GuiReplayOverlay
                 keyframeSetList.removeElement(keyframeSetList.getSelectionIndex());
                 break;
             case GuiConstants.KEYFRAME_REPOSITORY_LOAD_BUTTON:
-                ReplayHandler.useKeyframePresetFromRepository(keyframeSetList.getSelectionIndex());
+                ReplayHandler.useKeyframePreset(keyframeRepository[keyframeSetList.getSelectionIndex()].getKeyframes());
                 saveOnQuit();
                 mc.displayGuiScreen(null);
                 break;
diff --git a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java
index b85f3ca3..9a459a14 100755
--- a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java
+++ b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java
@@ -102,9 +102,13 @@ public class ReplayHandler {
     }
 
     public static void useKeyframePresetFromRepository(int index) {
+        useKeyframePreset(keyframeRepository[index].getKeyframes());
+    }
+
+    public static void useKeyframePreset(Keyframe[] kfs) {
         MarkerKeyframe[] markers = getMarkers();
 
-        keyframes = new ArrayList<Keyframe>(Arrays.asList(keyframeRepository[index].getKeyframes()));
+        keyframes = new ArrayList<Keyframe>(Arrays.asList(kfs));
 
         for(MarkerKeyframe mk : markers) {
             keyframes.add(mk);