diff --git a/sources/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java b/sources/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java
index b4b813bef..3583c6dbe 100644
--- a/sources/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java
+++ b/sources/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java
@@ -238,4 +238,9 @@ public class AkarinGlobalConfig {
     private static void messageBanIp() {
         messageBanIp = getString("messages.ban-player-ip", "You have been IP banned.");
     }
+    
+    public static String kickKeepAlive;
+    private static void kickKeepAlive() {
+        kickKeepAlive = getString("messages.kick-player-timeout-keep-alive", "Timed out");
+    }
 }
diff --git a/sources/src/main/java/io/akarin/server/core/AkarinSlackScheduler.java b/sources/src/main/java/io/akarin/server/core/AkarinSlackScheduler.java
index 5097977a3..e3a1be359 100644
--- a/sources/src/main/java/io/akarin/server/core/AkarinSlackScheduler.java
+++ b/sources/src/main/java/io/akarin/server/core/AkarinSlackScheduler.java
@@ -42,7 +42,7 @@ public class AkarinSlackScheduler extends Thread {
             PlayerConnection conn = player.playerConnection;
             // Paper - give clients a longer time to respond to pings as per pre 1.12.2 timings
             // This should effectively place the keepalive handling back to "as it was" before 1.12.2
-            long currentTime = System.currentTimeMillis();
+            long currentTime = System.nanoTime() / 1000000L;
             long elapsedTime = currentTime - conn.getLastPing();
             if (conn.isPendingPing()) {
                 // We're pending a ping from the client
diff --git a/sources/src/main/java/io/akarin/server/mixin/nsc/MixinPlayerConnection.java b/sources/src/main/java/io/akarin/server/mixin/nsc/MixinPlayerConnection.java
deleted file mode 100644
index 5cb9a6096..000000000
--- a/sources/src/main/java/io/akarin/server/mixin/nsc/MixinPlayerConnection.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.akarin.server.mixin.nsc;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-
-import net.minecraft.server.PlayerConnection;
-
-@Mixin(value = PlayerConnection.class, remap = false)
-public class MixinPlayerConnection {
-    @Overwrite
-    private long d() {
-        return System.currentTimeMillis(); // nanoTime() / 1000000L
-    }
-}
diff --git a/sources/src/main/resources/mixins.akarin.core.json b/sources/src/main/resources/mixins.akarin.core.json
index f551702b6..40c11df13 100644
--- a/sources/src/main/resources/mixins.akarin.core.json
+++ b/sources/src/main/resources/mixins.akarin.core.json
@@ -28,7 +28,6 @@
         "cps.MixinCraftWorld",
         "cps.MixinChunkProviderServer",
         
-        "nsc.MixinPlayerConnection",
         "nsc.OptimisticNetworkManager",
         "nsc.NonblockingServerConnection",