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 436d458e..f1c54283 100644
--- a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java
+++ b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java
@@ -226,12 +226,9 @@ public class FluidCellInventory implements IFluidCellInventory {
         if (types == 0) types = this.getTotalFluidTypes();
         if (l != null) {
             if (restrictionLong > 0) {
-                remaining = Math.min((restrictionLong / types) - l.getStackSize(), this.getUnusedFluidCount());
+                remaining = Math.min((restrictionLong / types) - l.getStackSize(), getRemainingFluidCount());
             } else {
-                remaining = (((this.getTotalBytes() / types)
-                        - (int) Math.ceil((double) l.getStackSize() / singleByteAmount)
-                        - getBytesPerType()) * singleByteAmount)
-                        + (singleByteAmount - l.getStackSize() % singleByteAmount);
+                remaining = (((getTotalBytes() / types) - getBytesPerType()) * singleByteAmount) - l.getStackSize();
             }
         } else {
             if (restrictionLong > 0) {