diff --git a/src/main/java/net/minecraftforge/client/model/ModelFluid.java b/src/main/java/net/minecraftforge/client/model/ModelFluid.java
index 02a5833042..f7a1fc121e 100644
--- a/src/main/java/net/minecraftforge/client/model/ModelFluid.java
+++ b/src/main/java/net/minecraftforge/client/model/ModelFluid.java
@@ -153,11 +153,13 @@ public class ModelFluid implements IModelCustomData
 
         private static int getFlow(Optional<IExtendedBlockState> stateOption)
         {
-            int flowRound = -1000;
+            float flow = -1000;
             if(stateOption.isPresent())
             {
-                flowRound = (int)Math.round(Math.toDegrees(stateOption.get().getValue(BlockFluidBase.FLOW_DIRECTION).doubleValue()));
+                flow = stateOption.get().getValue(BlockFluidBase.FLOW_DIRECTION);
             }
+            int flowRound = (int)Math.round(Math.toDegrees(flow));
+            flowRound = MathHelper.clamp_int(flowRound, -1000, 1000);
             return flowRound;
         }
 
@@ -197,7 +199,7 @@ public class ModelFluid implements IModelCustomData
 
                 TextureAtlasSprite topSprite = flowing;
                 float scale = 4;
-                if(flow < -999F)
+                if(flow < -17F)
                 {
                     flow = 0;
                     scale = 8;