diff --git a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java
index 034f9889..436d458e 100644
--- a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java
+++ b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java
@@ -397,8 +397,10 @@ public class FluidCellInventory implements IFluidCellInventory {
             if (cardDistribution) {
                 remainingFluidCount = this.getRemainingFluidCountDist(null);
             } else {
-                remainingFluidCount = this.getRemainingFluidCount()
-                        - ((long) this.getBytesPerType() * singleByteAmount);
+                remainingFluidCount = Math.min(
+                        getRemainingFluidCount(),
+                        getFreeBytes() * singleByteAmount + getUnusedFluidCount()
+                                - (long) getBytesPerType() * singleByteAmount);
             }
 
             if (remainingFluidCount > 0) {