diff --git a/build.gradle b/build.gradle
index 948d7d1..b96cc8d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,13 +62,6 @@ repositories {
         name = 'ModMaven'
         url = 'https://modmaven.dev'
     }
-    maven {
-        name = 'JEI Maven'
-        url = 'https://dvs1.progwml6.com/files/maven'
-        content {
-            includeGroup 'mezz.jei'
-        }
-    }
     maven {
         name = 'Curse Maven'
         url = 'https://www.cursemaven.com'
diff --git a/gradle.properties b/gradle.properties
index 87d8127..e2f380b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,14 +7,14 @@ mod_name=Exchangers
 mc_version=1.19.2
 mc_version_range=[1.19.2]
 
-forge_version=43.2.19
+forge_version=43.2.21
 forge_version_range=[43,)
 loader_version_range=[43,)
 
 mappings_channel=official
 mappings_version=1.19.2
 
-mod_version=3.4
+mod_version=3.4.1
 mod_license=Jacky's Minecraft Mods License
 mod_authors=Jackyy, TurkeyDev
 mod_description=Block Exchangers.
diff --git a/src/main/java/jackyy/exchangers/handler/ClientEventsHandler.java b/src/main/java/jackyy/exchangers/handler/ClientEventsHandler.java
index 8df5a48..a3090cb 100644
--- a/src/main/java/jackyy/exchangers/handler/ClientEventsHandler.java
+++ b/src/main/java/jackyy/exchangers/handler/ClientEventsHandler.java
@@ -143,6 +143,7 @@ public void onKeyInput(InputEvent.Key event) {
         if (player != null) {
             ItemStack heldItem = player.getMainHandItem();
             if (!heldItem.isEmpty() && heldItem.getItem() instanceof ItemExchangerBase) {
+                ExchangerHandler.setDefaultTagCompound(heldItem);
                 if (Keys.OPEN_GUI_KEY.get().isDown()) {
                     mc.setScreen(new ExchangersGuiScreen());
                 } else if (Keys.RANGE_SWITCH_KEY.get().isDown()) {
diff --git a/src/main/java/jackyy/exchangers/item/ItemExchangerBase.java b/src/main/java/jackyy/exchangers/item/ItemExchangerBase.java
index 3487ede..7273643 100644
--- a/src/main/java/jackyy/exchangers/item/ItemExchangerBase.java
+++ b/src/main/java/jackyy/exchangers/item/ItemExchangerBase.java
@@ -60,10 +60,12 @@ public InteractionResult useOn(UseOnContext context) {
         BlockPos pos = context.getClickedPos();
         Direction side = context.getClickedFace();
         if (!world.isClientSide() && player != null) {
+            ItemStack mainHandStack = player.getMainHandItem();
+            ExchangerHandler.setDefaultTagCompound(mainHandStack);
             if (player.isShiftKeyDown()) {
-                ExchangerHandler.selectBlock(player.getMainHandItem(), player, world, pos);
+                ExchangerHandler.selectBlock(mainHandStack, player, world, pos);
             } else {
-                ExchangerHandler.placeBlock(player.getMainHandItem(), player, world, pos, side, context);
+                ExchangerHandler.placeBlock(mainHandStack, player, world, pos, side, context);
             }
         }
         return InteractionResult.SUCCESS;