diff --git a/pom.xml b/pom.xml
index 379b009..c2b9e68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,12 +36,12 @@
             <version>2.11.3</version>
             <scope>provided</scope>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>de.marcely.bedwars</groupId>-->
-<!--            <artifactId>API</artifactId>-->
-<!--            <version>5.3.3</version>-->
-<!--            <scope>provided</scope>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>de.marcely.bedwars</groupId>
+            <artifactId>API</artifactId>
+            <version>5.4.4</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>me.metallicgoat.hotbarmanageraddon</groupId>
             <artifactId>API</artifactId>
@@ -56,13 +56,13 @@
             <scope>system</scope>
             <systemPath>${basedir}/libs/public/PrestigeAddonAPI-1.2.0.jar</systemPath>
         </dependency>
-        <dependency>
-            <groupId>de.marcely.bedwars</groupId>
-            <artifactId>API</artifactId>
-            <version>5.3.3</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/libs/public/BedwarsAPI-5.3.3.jar</systemPath>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>de.marcely.bedwars</groupId>-->
+<!--            <artifactId>API</artifactId>-->
+<!--            <version>5.3.3</version>-->
+<!--            <scope>system</scope>-->
+<!--            <systemPath>${basedir}/libs/public/BedwarsAPI-5.3.3.jar</systemPath>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
diff --git a/src/main/java/me/metallicgoat/tweaksaddon/tweaks/misc/EmptyContainers.java b/src/main/java/me/metallicgoat/tweaksaddon/tweaks/misc/EmptyContainers.java
index ea0aaeb..29670ba 100644
--- a/src/main/java/me/metallicgoat/tweaksaddon/tweaks/misc/EmptyContainers.java
+++ b/src/main/java/me/metallicgoat/tweaksaddon/tweaks/misc/EmptyContainers.java
@@ -15,7 +15,6 @@
 
 public class EmptyContainers implements Listener {
 
-  // Keep in mind 1.8 does not have an off-hand
   @EventHandler
   public void onBucketEmpty(PlayerBucketEmptyEvent event) {
     if (!MainConfig.remove_empty_buckets)
@@ -27,7 +26,9 @@ public void onBucketEmpty(PlayerBucketEmptyEvent event) {
     if (arena == null)
       return;
 
-    event.getItemStack().setType(Material.AIR);
+    // Uses isSimilar to remove ItemStacks (weird but works)
+    Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(MBedwarsTweaksPlugin.getInstance(), () ->
+        player.getInventory().removeItem(new ItemStack(Material.BUCKET)), 1);
   }
 
   @EventHandler
@@ -41,7 +42,8 @@ public void onConsume(PlayerItemConsumeEvent event) {
     if (arena == null)
       return;
 
+    // Uses isSimilar to remove ItemStacks (weird but works)
     Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(MBedwarsTweaksPlugin.getInstance(), () ->
-        event.getPlayer().getInventory().removeItem(new ItemStack(Material.GLASS_BOTTLE)), 1);
+        player.getInventory().removeItem(new ItemStack(Material.GLASS_BOTTLE)), 1);
   }
 }
\ No newline at end of file