diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d7ce1879..3bfd737b7 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - The Solderer inventory isn't sided anymore (raoulvdberge)
 - You can now use up and down arrows to scroll through Grid search history (raoulvdberge)
 - Fixed Grid crash (raoulvdberge)
+- Fixed Fluid Grid not formatting large quantities correctly (raoulvdberge)
 
 ### 1.4.2
 - Updated Forge to 2261 (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackFluid.java
index fcf8b3ccd..568a3b5d6 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackFluid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackFluid.java
@@ -35,7 +35,7 @@ public class GridStackFluid implements IGridStack {
 
     @Override
     public String[] getOreIds() {
-        return new String[]{ stack.getFluid().getName() };
+        return new String[]{stack.getFluid().getName()};
     }
 
     @Override
@@ -52,7 +52,7 @@ public class GridStackFluid implements IGridStack {
     public void draw(GuiBase gui, int x, int y, boolean isOverWithShift) {
         GuiBase.FLUID_RENDERER.draw(gui.mc, x, y, stack);
 
-        gui.drawQuantity(x, y, RSUtils.QUANTITY_FORMATTER.format((float) stack.amount / 1000F));
+        gui.drawQuantity(x, y, RSUtils.formatQuantity((int) ((float) stack.amount / 1000F)));
     }
 
     @Override