diff --git a/src/main/java/gregtech/api/capability/MultipleTankHandler.java b/src/main/java/gregtech/api/capability/MultipleTankHandler.java
index 87e223a1c90..6b39b82768c 100644
--- a/src/main/java/gregtech/api/capability/MultipleTankHandler.java
+++ b/src/main/java/gregtech/api/capability/MultipleTankHandler.java
@@ -171,7 +171,7 @@ public boolean canDrain() {
         public boolean canFillFluidType(FluidStack fluidStack) {
             if (allowSameFluidFill() || fluidStack == null) return true;
             for (Entry tank : getParentHandler()) {
-                // only consider tanks that do not allow same fluid fill
+                // only consider other tanks that do not allow same fluid fill
                 if (tank.allowSameFluidFill() || this == tank) continue;
                 if (fluidStack.isFluidEqual(tank.getFluid())) {
                     return tank.getFluidAmount() + fluidStack.amount <= tank.getCapacity();
diff --git a/src/main/java/gregtech/api/capability/impl/FluidTankList.java b/src/main/java/gregtech/api/capability/impl/FluidTankList.java
index b8643b4c630..770be604bef 100644
--- a/src/main/java/gregtech/api/capability/impl/FluidTankList.java
+++ b/src/main/java/gregtech/api/capability/impl/FluidTankList.java
@@ -37,10 +37,7 @@ public FluidTankList(boolean allowSameFluidFill, @NotNull List<? extends IFluidT
     public FluidTankList(boolean allowSameFluidFill, @NotNull MultipleTankHandler parent,
                          IFluidTank... additionalTanks) {
         int tanks = parent.size();
-        int additional = 0;
-
-        if (!ArrayUtils.isEmpty(additionalTanks))
-            additional = additionalTanks.length;
+        int additional = ArrayUtils.getLength(additionalTanks);
 
         this.tanks = new Entry[tanks + additional];
 
@@ -66,6 +63,7 @@ public int fill(FluidStack resource, boolean doFill) {
 
         // search for tanks with same fluid type first
         for (Entry tank : fluidTanks) {
+            // if empty or fluid doesn't match, skip
             if (tank.getFluidAmount() == 0 || !resource.isFluidEqual(tank.getFluid()))
                 continue;