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 55d8d2321..893174d52 100644
--- a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java
+++ b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java
@@ -188,13 +188,16 @@ public int getUnusedFluidCount() {
 
     @Override
     public int getStatusForCell() {
-        if (this.canHoldNewFluid()) {
+        if (this.getUsedBytes() == 0) {
             return 1;
         }
-        if (this.getRemainingFluidCount() > 0) {
+        if (this.canHoldNewFluid()) {
             return 2;
         }
-        return 3;
+        if (this.getRemainingFluidCount() > 0) {
+            return 3;
+        }
+        return 4;
     }
 
     protected void loadCellFluids() {
diff --git a/src/main/java/com/glodblock/github/common/storage/FluidCellInventoryHandler.java b/src/main/java/com/glodblock/github/common/storage/FluidCellInventoryHandler.java
index a76eee00d..79e0c4975 100644
--- a/src/main/java/com/glodblock/github/common/storage/FluidCellInventoryHandler.java
+++ b/src/main/java/com/glodblock/github/common/storage/FluidCellInventoryHandler.java
@@ -92,8 +92,8 @@ public IncludeExclude getIncludeExcludeMode() {
     public int getStatusForCell() {
         int val = this.getCellInv().getStatusForCell();
 
-        if (val == 1 && this.isPreformatted()) {
-            val = 2;
+        if ((val == 1 || val == 2) && this.isPreformatted()) {
+            val = 3;
         }
 
         return val;