diff --git a/common/buildcraft/transport/stripes/StripesHandlerBucket.java b/common/buildcraft/transport/stripes/StripesHandlerBucket.java
index 3b18a9e7..90cc3a7d 100644
--- a/common/buildcraft/transport/stripes/StripesHandlerBucket.java
+++ b/common/buildcraft/transport/stripes/StripesHandlerBucket.java
@@ -42,18 +42,31 @@ public class StripesHandlerBucket implements IStripesHandler {
 				pipe.sendItem(emptyBucket, direction.getOpposite());
 				
 				return true;
-			} else if (underblock instanceof IFluidBlock) {
-				Fluid fluid = ((IFluidBlock) underblock).getFluid();
-				FluidStack fluidStack = new FluidStack(fluid, 1000);
-				ItemStack filledBucket = FluidContainerRegistry.fillFluidContainer(fluidStack, emptyBucket);
+			} else {
+				ItemStack filledBucket = null;
+
+				if (underblock instanceof IFluidBlock) {
+					Fluid fluid = ((IFluidBlock) underblock).getFluid();
+					FluidStack fluidStack = new FluidStack(fluid, 1000);
+					filledBucket = FluidContainerRegistry.fillFluidContainer(fluidStack, emptyBucket);
+				}
+
+				if (underblock == Blocks.lava) {
+					filledBucket = new ItemStack(Items.lava_bucket, 1);
+				}
+
+				if (underblock == Blocks.water) {
+					filledBucket = new ItemStack(Items.water_bucket, 1);
+				}
+
 				if (filledBucket != null) {
 					world.setBlockToAir(x, y - 1, z);
-				
+
 					stack.stackSize = 0;
 					pipe.sendItem(filledBucket, direction.getOpposite());
+
+					return true;
 				}
-				
-				return true;
 			}
 
 			return false;