diff --git a/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java
index 3e0e9ec382c..b702641969c 100644
--- a/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java
+++ b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java
@@ -151,7 +151,7 @@ public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer e
                 if (amount == liquid.amount) {
                     logic.fill(ForgeDirection.UNKNOWN, liquid, true);
                     if (!entityplayer.capabilities.isCreativeMode) {
-                        replaceHeldItem(entityplayer, getEmptyContainer(current));
+                        replaceHeldItem(entityplayer, FluidContainerRegistry.drainFluidContainer(current));
                     }
 
                     // update
@@ -190,14 +190,6 @@ else if (FluidContainerRegistry.isContainer(current)) {
         return false;
     }
 
-    private static ItemStack getEmptyContainer(ItemStack stack) {
-        Item item = stack.getItem();
-        if (item != null && item.hasContainerItem(stack)) return item.getContainerItem(stack);
-        else if (FluidContainerRegistry.isFilledContainer(stack))
-            return FluidContainerRegistry.drainFluidContainer(stack);
-        else return null;
-    }
-
     /**
      * Replace one currently held item for a given player.
      *