diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/input/LeftClickHandler.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/input/LeftClickHandler.kt
index 432cb71e1..a9e7d1f31 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/input/LeftClickHandler.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/input/LeftClickHandler.kt
@@ -191,7 +191,7 @@ class LeftClickHandler(
             speedMultiplier *= 0.3f.pow(it.amplifier + 1)
         }
 
-        // ToDp: Check if is in water
+        // ToDo: Check if is in water
 
         if (!connection.player.entity.onGround) {
             speedMultiplier /= 5.0f
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PingS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PingS2CP.kt
index 25f54f565..040d1d424 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PingS2CP.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PingS2CP.kt
@@ -13,6 +13,8 @@
 
 package de.bixilon.minosoft.protocol.packets.s2c.play
 
+import de.bixilon.minosoft.protocol.network.connection.PlayConnection
+import de.bixilon.minosoft.protocol.packets.c2s.play.PongC2SP
 import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket
 import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer
 import de.bixilon.minosoft.util.logging.Log
@@ -22,6 +24,11 @@ import de.bixilon.minosoft.util.logging.LogMessageType
 class PingS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket() {
     val id = buffer.readInt()
 
+
+    override fun handle(connection: PlayConnection) {
+        connection.sendPacket(PongC2SP(id))
+    }
+
     override fun log() {
         Log.log(LogMessageType.NETWORK_PACKETS_IN, LogLevels.VERBOSE) { "Ping (id=$id)" }
     }
diff --git a/src/main/java/de/bixilon/minosoft/util/task/ThreadPool.kt b/src/main/java/de/bixilon/minosoft/util/task/ThreadPool.kt
index 73c0fbe37..9748ea2bc 100644
--- a/src/main/java/de/bixilon/minosoft/util/task/ThreadPool.kt
+++ b/src/main/java/de/bixilon/minosoft/util/task/ThreadPool.kt
@@ -43,10 +43,10 @@ class ThreadPool(
             try {
                 availableThreads += Thread.currentThread()
                 Thread.sleep(Long.MAX_VALUE)
-                availableThreads -= Thread.currentThread()
             } catch (exception: InterruptedException) {
                 // Log.log(LogMessageType.OTHER, LogLevels.VERBOSE) { "Thread (${Thread.currentThread()} sleeping got interrupted" }
             }
+            availableThreads -= Thread.currentThread()
         }
 
         for (i in 0 until threadCount - threads.size) {