diff --git a/src/main/java/net/minecraftforge/fluids/FluidStack.java b/src/main/java/net/minecraftforge/fluids/FluidStack.java
index 5c4cfaa881..8b5eeba3a8 100644
--- a/src/main/java/net/minecraftforge/fluids/FluidStack.java
+++ b/src/main/java/net/minecraftforge/fluids/FluidStack.java
@@ -315,7 +315,6 @@ public class FluidStack
     {
         int code = 1;
         code = 31*code + getFluid().hashCode();
-        code = 31*code + amount;
         if (tag != null)
             code = 31*code + tag.hashCode();
         return code;
diff --git a/src/test/java/net/minecraftforge/debug/CodecsTest.java b/src/test/java/net/minecraftforge/debug/CodecsTest.java
index 8299dc27ae..24e8a93639 100644
--- a/src/test/java/net/minecraftforge/debug/CodecsTest.java
+++ b/src/test/java/net/minecraftforge/debug/CodecsTest.java
@@ -61,9 +61,9 @@ public class CodecsTest
             LOGGER.error("Error decoding withTag: {}", error);
         }).getFirst();
 
-        if (!noTag.equals(noTag_decode))
+        if (!noTag.isFluidStackIdentical(noTag_decode))
             throw new IllegalStateException("Decoded noTag does not match");
-        if (!withTag.equals(withTag_decode))
+        if (!withTag.isFluidStackIdentical(withTag_decode))
             throw new IllegalStateException("Decoded withTag does not match");
     }
 }