diff --git a/common/buildcraft/factory/BlockTank.java b/common/buildcraft/factory/BlockTank.java
index 5ca3ddb4..b4f23419 100644
--- a/common/buildcraft/factory/BlockTank.java
+++ b/common/buildcraft/factory/BlockTank.java
@@ -113,10 +113,10 @@ public class BlockTank extends BlockBuildCraft {
 						if (qty != 0 && !BuildCraftCore.debugWorldgen && !entityplayer.capabilities.isCreativeMode) {
 							if (current.stackSize > 1) {
 								if (!entityplayer.inventory.addItemStackToInventory(FluidContainerRegistry.drainFluidContainer(current))) {
-									return false;
-								} else {
-									entityplayer.inventory.setInventorySlotContents(entityplayer.inventory.currentItem, InvUtils.consumeItem(current));
+									entityplayer.dropPlayerItemWithRandomChoice(FluidContainerRegistry.drainFluidContainer(current), false);
 								}
+
+								entityplayer.inventory.setInventorySlotContents(entityplayer.inventory.currentItem, InvUtils.consumeItem(current));
 							} else {
 								entityplayer.inventory.setInventorySlotContents(entityplayer.inventory.currentItem, FluidContainerRegistry.drainFluidContainer(current));
 							}
diff --git a/common/buildcraft/transport/pluggable/ItemLens.java b/common/buildcraft/transport/pluggable/ItemLens.java
index cda41fdf..ce561d2f 100755
--- a/common/buildcraft/transport/pluggable/ItemLens.java
+++ b/common/buildcraft/transport/pluggable/ItemLens.java
@@ -37,6 +37,7 @@ public class ItemLens extends ItemBuildCraft implements IPipePluggableItem {
 
 	public ItemLens() {
 		super();
+		setHasSubtypes(true);
 	}
 
 	@Override