diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc97a9b..102c090 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1 +1 @@
-- Fix skin rendering by @forkiesassds in https://github.com/js6pak/mojangfix/pull/16
\ No newline at end of file
+- Fix container offset when swapping items to hotbar slots
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 364fe61..91c9ece 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.14.24-babric.1
 
 # Mod Properties
-	mod_version = 0.5.3
+	mod_version = 0.5.4
 	maven_group = pl.js6pak
 	archives_base_name = mojangfix
 
diff --git a/src/main/java/pl/js6pak/mojangfix/mixin/client/controls/ControlsOptionsScreenMixin.java b/src/main/java/pl/js6pak/mojangfix/mixin/client/controls/ControlsOptionsScreenMixin.java
index 7d07de1..abde05d 100644
--- a/src/main/java/pl/js6pak/mojangfix/mixin/client/controls/ControlsOptionsScreenMixin.java
+++ b/src/main/java/pl/js6pak/mojangfix/mixin/client/controls/ControlsOptionsScreenMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 js6pak
+ * Copyright (C) 2022-2024 js6pak
  *
  * This file is part of MojangFix.
  *
diff --git a/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/ContainerScreenMixin.java b/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/ContainerScreenMixin.java
index f81e067..7a03211 100644
--- a/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/ContainerScreenMixin.java
+++ b/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/ContainerScreenMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 js6pak
+ * Copyright (C) 2022-2024 js6pak
  *
  * This file is part of MojangFix.
  *
@@ -103,10 +103,12 @@ private void onKeyPressed(char character, int keyCode, CallbackInfo ci) {
             this.minecraft.interactionManager.clickSlot(this.container.syncId, slot.id, 0, false, this.minecraft.player);
         }
 
-        if (keyCode >= Keyboard.KEY_1 && keyCode <= Keyboard.KEY_9) {
+        if (  (null != this.container.slots)
+           && (10 <= this.container.slots.size())
+        ) {
             if (this.minecraft.player.inventory.getCursorStack() == null)
                 this.minecraft.interactionManager.clickSlot(this.container.syncId, slot.id, 0, false, this.minecraft.player);
-            this.minecraft.interactionManager.clickSlot(this.container.syncId, 35 + keyCode - 1, 0, false, this.minecraft.player);
+            this.minecraft.interactionManager.clickSlot(this.container.syncId, (this.container.slots.size() - 10) + keyCode - 1, 0, false, this.minecraft.player);
             this.minecraft.interactionManager.clickSlot(this.container.syncId, slot.id, 0, false, this.minecraft.player);
         }
     }
diff --git a/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/PlayerEntityMixin.java b/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/PlayerEntityMixin.java
index 692ace8..18a3dcd 100644
--- a/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/PlayerEntityMixin.java
+++ b/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/PlayerEntityMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 js6pak
+ * Copyright (C) 2022-2024 js6pak
  *
  * This file is part of MojangFix.
  *
diff --git a/src/main/java/pl/js6pak/mojangfix/mixin/client/skin/BipedEntityModelMixin.java b/src/main/java/pl/js6pak/mojangfix/mixin/client/skin/BipedEntityModelMixin.java
index 7c14c88..0750d17 100644
--- a/src/main/java/pl/js6pak/mojangfix/mixin/client/skin/BipedEntityModelMixin.java
+++ b/src/main/java/pl/js6pak/mojangfix/mixin/client/skin/BipedEntityModelMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 js6pak
+ * Copyright (C) 2022-2024 js6pak
  *
  * This file is part of MojangFix.
  *