diff --git a/src/main/java/codechicken/nei/NEIClientUtils.java b/src/main/java/codechicken/nei/NEIClientUtils.java
index 649819d0..d103f500 100644
--- a/src/main/java/codechicken/nei/NEIClientUtils.java
+++ b/src/main/java/codechicken/nei/NEIClientUtils.java
@@ -571,7 +571,7 @@ public class NEIClientUtils extends NEIServerUtils {
             return multiplier;
         }
 
-        return StackInfo.itemStackToNBT(stack).hasKey("gtFluidName") ? 144 : stack.getMaxStackSize();
+        return StackInfo.isFluidDisplayItem(stack) ? 144 : stack.getMaxStackSize();
     }
 
     public static void drawRect(double left, double top, double width, double height, Color color) {
diff --git a/src/main/java/codechicken/nei/bookmark/tree/ItemTreeSlot.java b/src/main/java/codechicken/nei/bookmark/tree/ItemTreeSlot.java
index b29e1c3d..a34f7404 100644
--- a/src/main/java/codechicken/nei/bookmark/tree/ItemTreeSlot.java
+++ b/src/main/java/codechicken/nei/bookmark/tree/ItemTreeSlot.java
@@ -54,7 +54,7 @@ class ItemTreeSlot {
             this.emptyStack = ingrItem.getItemStack(0);
         }
 
-        this.isFluidDisplay = StackInfo.itemStackToNBT(this.emptyStack).hasKey("gtFluidName");
+        this.isFluidDisplay = StackInfo.isFluidDisplayItem(this.emptyStack);
         this.isContainerItem = isContainerItem(this.emptyStack);
     }
 
diff --git a/src/main/java/codechicken/nei/bookmark/tree/StatsPanel.java b/src/main/java/codechicken/nei/bookmark/tree/StatsPanel.java
index cb0bf178..14403435 100644
--- a/src/main/java/codechicken/nei/bookmark/tree/StatsPanel.java
+++ b/src/main/java/codechicken/nei/bookmark/tree/StatsPanel.java
@@ -78,7 +78,7 @@ class StatsPanel extends ScrollContainer {
             this.icon = icon;
             this.recipeId = recipeId;
             this.multiplier = multiplier;
-            this.isFluidDisplay = StackInfo.itemStackToNBT(stack).hasKey("gtFluidName");
+            this.isFluidDisplay = StackInfo.isFluidDisplayItem(stack);
             this.info = this.recipeId != null ? handlerInfo(this.recipeId.getHandlerName()) : null;
             this.w = SLOT_SIZE;
             this.h = SLOT_SIZE;