diff --git a/src/main/java/de/bixilon/minosoft/data/container/types/PlayerInventory.kt b/src/main/java/de/bixilon/minosoft/data/container/types/PlayerInventory.kt
index eac4acb81..c15153426 100644
--- a/src/main/java/de/bixilon/minosoft/data/container/types/PlayerInventory.kt
+++ b/src/main/java/de/bixilon/minosoft/data/container/types/PlayerInventory.kt
@@ -41,7 +41,7 @@ import de.bixilon.minosoft.data.registries.identified.ResourceLocation
 import de.bixilon.minosoft.data.text.ChatComponent
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.protocol.packets.c2s.play.entity.player.ClientActionC2SP
-import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_1_8_9
+import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_17W13B
 import de.bixilon.minosoft.util.KUtil.toResourceLocation
 
 // https://c4k3.github.io/wiki.vg/images/1/13/Inventory-slots.png
@@ -104,7 +104,7 @@ class PlayerInventory(
     }
 
     override fun onOpen() {
-        if (connection.version <= V_1_8_9) { // TODO: find out version
+        if (connection.version < V_17W13B) {
             connection.network.send(ClientActionC2SP(ClientActionC2SP.ClientActions.OPEN_INVENTORY))
         }
     }
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/player/ClientActionC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/player/ClientActionC2SP.kt
index c96ef2b58..9dc969787 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/player/ClientActionC2SP.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/entity/player/ClientActionC2SP.kt
@@ -40,7 +40,7 @@ class ClientActionC2SP(
     enum class ClientActions {
         PERFORM_RESPAWN,
         REQUEST_STATISTICS,
-        OPEN_INVENTORY,
+        OPEN_INVENTORY, // removed in 17w13b
         ;
 
         companion object : ValuesEnum<ClientActions> {
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/OpenContainerS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/OpenContainerS2CP.kt
index 309a3c9a9..119a17e8c 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/OpenContainerS2CP.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/container/OpenContainerS2CP.kt
@@ -20,8 +20,9 @@ import de.bixilon.minosoft.modding.event.events.container.ContainerOpenEvent
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket
 import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_14W03B
-import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_19W11A
+import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_19W02A
 import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_1_14
+import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_1_8_9
 import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer
 import de.bixilon.minosoft.util.logging.Log
 import de.bixilon.minosoft.util.logging.LogLevels
@@ -45,18 +46,18 @@ class OpenContainerS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
         }
     }
     val title: ChatComponent = buffer.readChatComponent()
-    val slotCount: Int = if (buffer.versionId <= V_19W11A) { // ToDo: This is completely guessed, it is not present in 1.16.5 (unchecked)
+    val slotCount: Int = if (buffer.versionId <= V_19W02A) { // ToDo: This is completely guessed, it is not present in 1.16.5 (unchecked)
         buffer.readUnsignedByte()
     } else {
         // ToDo: load from pixlyzer
         0
     }
-    val hasTitle: Boolean = if (buffer.versionId > V_14W03B && buffer.versionId <= V_1_14) { // upper version completely guessed
+    val hasTitle: Boolean = if (buffer.versionId > V_14W03B && buffer.versionId <= V_1_8_9) { // TODO: upper version (1.8) is probably worng. it changed between 1.7.10..1.8
         buffer.readBoolean()
     } else {
         true
     }
-    var entityId: Int? = if (containerType.identifier == DefaultInventoryTypes.HORSE || buffer.versionId < V_14W03B) { // ToDo: This was removed at some point
+    var entityId: Int? = if (buffer.versionId >= V_19W02A && (containerType.identifier == DefaultInventoryTypes.HORSE || buffer.versionId < V_14W03B)) {
         buffer.readInt()
     } else {
         null