diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md
index b7a19d94..8a347d88 100644
--- a/docs/src/progress/renderertodo.md
+++ b/docs/src/progress/renderertodo.md
@@ -1209,6 +1209,7 @@ Explicit memory management of fluid chunk cache buffers
 Fix GriddedDataCellManager memory leak caused by physics and ConcurrentHashMap
 Fix fluid sim null pointer bug with unallocated chunks
 Fix fluid sim NP bug with skipped chunks
+Fix fluid chunk indexing from java side
 
 
 
diff --git a/src/main/java/electrosphere/client/fluid/cache/FluidChunkData.java b/src/main/java/electrosphere/client/fluid/cache/FluidChunkData.java
index e94cf8a5..23050637 100644
--- a/src/main/java/electrosphere/client/fluid/cache/FluidChunkData.java
+++ b/src/main/java/electrosphere/client/fluid/cache/FluidChunkData.java
@@ -87,7 +87,7 @@ public class FluidChunkData {
      * @return The index
      */
     public int IX(int x, int y, int z){
-        return x * ServerFluidChunk.BUFFER_DIM * ServerFluidChunk.BUFFER_DIM + y * ServerFluidChunk.BUFFER_DIM  + z;
+        return x + y * ServerFluidChunk.BUFFER_DIM  + z * ServerFluidChunk.BUFFER_DIM * ServerFluidChunk.BUFFER_DIM;
     }
 
     /**
diff --git a/src/main/java/electrosphere/server/fluid/manager/ServerFluidChunk.java b/src/main/java/electrosphere/server/fluid/manager/ServerFluidChunk.java
index f302a505..f0c356f8 100644
--- a/src/main/java/electrosphere/server/fluid/manager/ServerFluidChunk.java
+++ b/src/main/java/electrosphere/server/fluid/manager/ServerFluidChunk.java
@@ -401,7 +401,7 @@ public class ServerFluidChunk {
      * @return The index
      */
     public int IX(int x, int y, int z){
-        return x * ServerFluidChunk.BUFFER_DIM * ServerFluidChunk.BUFFER_DIM + y * ServerFluidChunk.BUFFER_DIM  + z;
+        return x + y * ServerFluidChunk.BUFFER_DIM  + z * ServerFluidChunk.BUFFER_DIM * ServerFluidChunk.BUFFER_DIM;
     }
 
     /**