diff --git a/src/main/java/net/minecraftforge/fluids/ItemFluidContainer.java b/src/main/java/net/minecraftforge/fluids/ItemFluidContainer.java
index 111777d0cf..2041047c3a 100644
--- a/src/main/java/net/minecraftforge/fluids/ItemFluidContainer.java
+++ b/src/main/java/net/minecraftforge/fluids/ItemFluidContainer.java
@@ -135,10 +135,11 @@ public class ItemFluidContainer extends Item implements IFluidContainerItem
             return null;
         }
 
+        int currentAmount = stack.amount;
         stack.amount = Math.min(stack.amount, maxDrain);
         if (doDrain)
         {
-            if (maxDrain >= capacity)
+            if (currentAmount == stack.amount)
             {
                 container.stackTagCompound.removeTag("Fluid");
 
@@ -150,7 +151,7 @@ public class ItemFluidContainer extends Item implements IFluidContainerItem
             }
 
             NBTTagCompound fluidTag = container.stackTagCompound.getCompoundTag("Fluid");
-            fluidTag.setInteger("Amount", fluidTag.getInteger("Amount") - maxDrain);
+            fluidTag.setInteger("Amount", currentAmount - stack.amount);
             container.stackTagCompound.setTag("Fluid", fluidTag);
         }
         return stack;