diff --git a/src/main/java/net/minecraftforge/fluids/ItemFluidContainer.java b/src/main/java/net/minecraftforge/fluids/ItemFluidContainer.java
index 2aecc1c..0587c31 100644
--- a/src/main/java/net/minecraftforge/fluids/ItemFluidContainer.java
+++ b/src/main/java/net/minecraftforge/fluids/ItemFluidContainer.java
@@ -135,10 +135,11 @@
 			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 @@
 			}
 
 			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;
diff --git a/src/main/resources/fmlversion.properties b/src/main/resources/fmlversion.properties
index 431325d..b7f4d89 100644
--- a/src/main/resources/fmlversion.properties
+++ b/src/main/resources/fmlversion.properties
@@ -1,6 +1,6 @@
 fmlbuild.major.number=7
 fmlbuild.minor.number=10
 fmlbuild.revision.number=25
-fmlbuild.build.number=70
+fmlbuild.build.number=71
 fmlbuild.mcversion=1.7.10
 fmlbuild.mcpversion=9.05