diff --git a/CHANGELOG.md b/CHANGELOG.md
index a71ccbdc..2142af02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1 +1 @@
-- fix #305 properly and remove the workaround
+- fix #307
diff --git a/src/main/java/de/mari_023/ae2wtlib/AE2wtlibClient.java b/src/main/java/de/mari_023/ae2wtlib/AE2wtlibClient.java
new file mode 100644
index 00000000..0097c21b
--- /dev/null
+++ b/src/main/java/de/mari_023/ae2wtlib/AE2wtlibClient.java
@@ -0,0 +1,13 @@
+package de.mari_023.ae2wtlib;
+
+import net.minecraft.client.Minecraft;
+
+import de.mari_023.ae2wtlib.wct.CraftingTerminalHandler;
+
+public class AE2wtlibClient {
+    public static void clientTick() {
+        if (Minecraft.getInstance().player == null)
+            return;
+        CraftingTerminalHandler.getCraftingTerminalHandler(Minecraft.getInstance().player).checkTerminal();
+    }
+}
diff --git a/src/main/java/de/mari_023/ae2wtlib/AE2wtlibForge.java b/src/main/java/de/mari_023/ae2wtlib/AE2wtlibForge.java
index a3027bd4..889b4f74 100644
--- a/src/main/java/de/mari_023/ae2wtlib/AE2wtlibForge.java
+++ b/src/main/java/de/mari_023/ae2wtlib/AE2wtlibForge.java
@@ -1,6 +1,5 @@
 package de.mari_023.ae2wtlib;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
@@ -33,7 +32,6 @@
 import de.mari_023.ae2wtlib.api.AE2wtlibAPI;
 import de.mari_023.ae2wtlib.api.terminal.ItemWT;
 import de.mari_023.ae2wtlib.networking.*;
-import de.mari_023.ae2wtlib.wct.CraftingTerminalHandler;
 
 @Mod(AE2wtlibAPI.MOD_NAME)
 @EventBusSubscriber
@@ -148,8 +146,6 @@ public static void handle(ArrowLooseEvent event) {
 
     @SubscribeEvent
     public static void handle(ClientTickEvent.Post event) {
-        if (Minecraft.getInstance().player == null)
-            return;
-        CraftingTerminalHandler.getCraftingTerminalHandler(Minecraft.getInstance().player).checkTerminal();
+        AE2wtlibClient.clientTick();
     }
 }