diff --git a/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/BlockBreak.java b/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/BlockBreak.java
index 5f62d90d..594707fb 100644
--- a/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/BlockBreak.java
+++ b/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/BlockBreak.java
@@ -1,9 +1,9 @@
 package com.willfp.ecoenchants.v1_16_R3;
 
 import com.willfp.ecoenchants.nms.API.BlockBreakWrapper;
-import net.minecraft.server.v1_16_R2.BlockPosition;
+import net.minecraft.server.v1_16_R3.BlockPosition;
 import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
 public class BlockBreak implements BlockBreakWrapper {
diff --git a/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/RepairCost.java b/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/RepairCost.java
index baa3481c..a00f4e7e 100644
--- a/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/RepairCost.java
+++ b/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/RepairCost.java
@@ -1,20 +1,20 @@
 package com.willfp.ecoenchants.v1_16_R3;
 
 import com.willfp.ecoenchants.nms.API.RepairCostWrapper;
-import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 
 public class RepairCost implements RepairCostWrapper {
     @Override
     public ItemStack setRepairCost(ItemStack itemStack, int cost) {
-        net.minecraft.server.v1_16_R2.ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);
+        net.minecraft.server.v1_16_R3.ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);
         nmsStack.setRepairCost(cost);
         return CraftItemStack.asBukkitCopy(nmsStack);
     }
 
     @Override
     public int getRepairCost(ItemStack itemStack) {
-        net.minecraft.server.v1_16_R2.ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);
+        net.minecraft.server.v1_16_R3.ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);
         return nmsStack.getRepairCost();
     }
 }
\ No newline at end of file
diff --git a/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/TridentStack.java b/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/TridentStack.java
index 0be9370a..fa0101de 100644
--- a/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/TridentStack.java
+++ b/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/TridentStack.java
@@ -1,9 +1,9 @@
 package com.willfp.ecoenchants.v1_16_R3;
 
 import com.willfp.ecoenchants.nms.API.TridentStackWrapper;
-import net.minecraft.server.v1_16_R2.EntityThrownTrident;
-import org.bukkit.craftbukkit.v1_16_R2.entity.CraftTrident;
-import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;
+import net.minecraft.server.v1_16_R3.EntityThrownTrident;
+import org.bukkit.craftbukkit.v1_16_R3.entity.CraftTrident;
+import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
 import org.bukkit.entity.Trident;
 import org.bukkit.inventory.ItemStack;
 
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java b/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java
index 4e6ecb25..e84661fc 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java
@@ -53,11 +53,8 @@ public final class PacketOpenWindowMerchant extends AbstractPacketAdapter {
                 Object selling = fSelling.get(handle); // NMS Selling ItemStack
                 modifiersField.setInt(fSelling, fSelling.getModifiers() & ~Modifier.FINAL);
 
-                String nmsVersion = EcoEnchantsPlugin.nmsVersion; // Fuck you spigot for making me do this
-                if(nmsVersion.equalsIgnoreCase("v1_16_R3")) nmsVersion = "v1_16_R2";
-
                 // Reflectively access CraftItemStack.class for respective version
-                Class<?> craftItemStack = Class.forName("org.bukkit.craftbukkit." + nmsVersion + ".inventory.CraftItemStack");
+                Class<?> craftItemStack = Class.forName("org.bukkit.craftbukkit." + EcoEnchantsPlugin.nmsVersion + ".inventory.CraftItemStack");
 
                 // Bukkit Result ItemStack from NMS Result ItemStack
                 ItemStack nmsSelling = (ItemStack) craftItemStack.getMethod("asBukkitCopy", selling.getClass()).invoke(null, selling);