diff --git a/src/main/java/storagecraft/tile/TileCable.java b/src/main/java/storagecraft/tile/TileCable.java
index 7ee7856bb..df575ca0a 100644
--- a/src/main/java/storagecraft/tile/TileCable.java
+++ b/src/main/java/storagecraft/tile/TileCable.java
@@ -33,6 +33,7 @@ public class TileCable extends TileBase
 
 	public boolean isEnabled()
 	{
+		// @TODO: Fix going through blocks
 		return !worldObj.isBlockPowered(pos);
 	}
 
diff --git a/src/main/java/storagecraft/tile/TileConstructor.java b/src/main/java/storagecraft/tile/TileConstructor.java
index b53bc50e4..ba6a805e9 100644
--- a/src/main/java/storagecraft/tile/TileConstructor.java
+++ b/src/main/java/storagecraft/tile/TileConstructor.java
@@ -31,7 +31,7 @@ public class TileConstructor extends TileMachine implements ICompareSetting
 		{
 			BlockPos front = pos.offset(getDirection());
 
-			if (worldObj.isAirBlock(front) && inventory.getStackInSlot(0) != null)
+			if ((worldObj.isAirBlock(front) || worldObj.getBlockState(front).getBlock().getMaterial().isLiquid()) && inventory.getStackInSlot(0) != null)
 			{
 				ItemStack took = getController().take(inventory.getStackInSlot(0).copy(), compare);