diff --git a/src/main/java/appeng/parts/p2p/PartP2PLiquids.java b/src/main/java/appeng/parts/p2p/PartP2PLiquids.java
index 2a5ce267..370986ab 100644
--- a/src/main/java/appeng/parts/p2p/PartP2PLiquids.java
+++ b/src/main/java/appeng/parts/p2p/PartP2PLiquids.java
@@ -150,7 +150,8 @@ public class PartP2PLiquids extends PartP2PTunnel<PartP2PLiquids> implements IFl
 
 		i = list.iterator();
 		int used = 0;
-		while( i.hasNext() )
+
+		while( i.hasNext() && available > 0 )
 		{
 			final PartP2PLiquids l = i.next();
 
@@ -172,7 +173,7 @@ public class PartP2PLiquids extends PartP2PTunnel<PartP2PLiquids> implements IFl
 			}
 
 			available -= insert.amount;
-			used += insert.amount;
+			used += l.tmpUsed;
 		}
 
 		if( stack.pop() != this )