diff --git a/common/net/minecraftforge/fluids/BlockFluidBase.java b/common/net/minecraftforge/fluids/BlockFluidBase.java
index a3bc54f76..c81e9e237 100644
--- a/common/net/minecraftforge/fluids/BlockFluidBase.java
+++ b/common/net/minecraftforge/fluids/BlockFluidBase.java
@@ -323,7 +323,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
     public static double getFlowDirection(IBlockAccess world, int x, int y, int z)
     {
         Block block = Block.blocksList[world.getBlockId(x, y, z)];
-        if (!(block instanceof BlockFluidBase))
+        if (world.getBlockMaterial(x, y, z).isLiquid())
         {
             return -1000.0;
         }
diff --git a/common/net/minecraftforge/fluids/RenderBlockFluid.java b/common/net/minecraftforge/fluids/RenderBlockFluid.java
index 6a065c554..bb2116db2 100644
--- a/common/net/minecraftforge/fluids/RenderBlockFluid.java
+++ b/common/net/minecraftforge/fluids/RenderBlockFluid.java
@@ -55,7 +55,7 @@ public class RenderBlockFluid implements ISimpleBlockRenderingHandler
     {
         if (world.getBlockId(x, y, z) == block.blockID)
         {
-            if (world.getBlockId(x, y - block.densityDir, z) == block.blockID)
+            if (world.getBlockMaterial(x, y - block.densityDir, z).isLiquid())
             {
                 return 1;
             }