diff --git a/src/main/java/com/replaymod/core/mixin/Mixin_PostRenderWorldCalback.java b/src/main/java/com/replaymod/core/mixin/Mixin_PostRenderWorldCalback.java
index ec85fe86..24561031 100644
--- a/src/main/java/com/replaymod/core/mixin/Mixin_PostRenderWorldCalback.java
+++ b/src/main/java/com/replaymod/core/mixin/Mixin_PostRenderWorldCalback.java
@@ -2,32 +2,26 @@
 package com.replaymod.core.mixin;
 
 import com.replaymod.core.events.PostRenderWorldCallback;
-import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(GameRenderer.class)
+//#if MC>=11500
+import com.llamalad7.mixinextras.sugar.Local;
+//#endif
+
+@Mixin(WorldRenderer.class)
 public class Mixin_PostRenderWorldCalback {
-    @Inject(
-            method = "renderWorld",
-            at = @At(
-                    value = "FIELD",
-                    target = "Lnet/minecraft/client/render/GameRenderer;renderHand:Z"
-            )
-    )
-    private void postRenderWorld(
-            float partialTicks,
-            long nanoTime,
-            //#if MC>=11500
-            MatrixStack matrixStack,
-            //#endif
-            CallbackInfo ci) {
-        //#if MC<11500
-        //$$ MatrixStack matrixStack = new MatrixStack();
-        //#endif
+    @Inject(method = "render", at = @At("RETURN"))
+    //#if MC>=11500
+    private void postRenderWorld(CallbackInfo ci, @Local(argsOnly = true) MatrixStack matrixStack) {
+    //#else
+    //$$ private void postRenderWorld(CallbackInfo ci) {
+    //$$     MatrixStack matrixStack = new MatrixStack();
+    //#endif
         PostRenderWorldCallback.EVENT.invoker().postRenderWorld(matrixStack);
     }
 }