diff --git a/src/main/java/electrosphere/client/fluid/cells/FluidCellManager.java b/src/main/java/electrosphere/client/fluid/cells/FluidCellManager.java
index c7608c67..26d75cfb 100644
--- a/src/main/java/electrosphere/client/fluid/cells/FluidCellManager.java
+++ b/src/main/java/electrosphere/client/fluid/cells/FluidCellManager.java
@@ -171,8 +171,6 @@ public class FluidCellManager {
                     drawable.add(targetKey);
                     //make drawable entity
                     keyCellMap.get(targetKey).generateDrawableEntity();
-                    //evaluate for foliage
-                    Globals.clientFoliageManager.evaluateChunk(worldPos);
                 }
             }
         }
diff --git a/src/main/java/electrosphere/engine/loadingthreads/DebugSPWorldLoading.java b/src/main/java/electrosphere/engine/loadingthreads/DebugSPWorldLoading.java
index f2e35ce7..0d8d6df9 100644
--- a/src/main/java/electrosphere/engine/loadingthreads/DebugSPWorldLoading.java
+++ b/src/main/java/electrosphere/engine/loadingthreads/DebugSPWorldLoading.java
@@ -17,6 +17,8 @@ import electrosphere.net.parser.net.message.TerrainMessage;
 import electrosphere.net.server.ServerConnectionHandler;
 import electrosphere.renderer.ui.Window;
 import electrosphere.server.content.ServerContentManager;
+import electrosphere.server.fluid.generation.ArenaFluidGenerator;
+import electrosphere.server.fluid.manager.ServerFluidManager;
 import electrosphere.server.saves.SaveUtils;
 import electrosphere.server.terrain.generation.OverworldChunkGenerator;
 import electrosphere.server.terrain.manager.ServerTerrainManager;
@@ -47,6 +49,8 @@ public class DebugSPWorldLoading {
             //create world.json
             Globals.serverWorldData = ServerWorldData.createGameWorld(Globals.serverTerrainManager);
             FileUtils.serializeObjectToSavePath("random_sp_world", "./world.json", Globals.serverWorldData);
+            //create mock fluid sim manager
+            Globals.serverFluidManager = new ServerFluidManager(Globals.serverTerrainManager, 2000, 50, 0.0f, 0, new ArenaFluidGenerator());
         }
         //load just-created save
         SaveUtils.loadSave("random_sp_world");
diff --git a/src/main/java/electrosphere/server/saves/SaveUtils.java b/src/main/java/electrosphere/server/saves/SaveUtils.java
index e86184fa..38ffde1d 100644
--- a/src/main/java/electrosphere/server/saves/SaveUtils.java
+++ b/src/main/java/electrosphere/server/saves/SaveUtils.java
@@ -7,6 +7,8 @@ import electrosphere.game.server.world.ServerWorldData;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.server.content.ServerContentManager;
 import electrosphere.server.db.DatabaseUtils;
+import electrosphere.server.fluid.generation.ArenaFluidGenerator;
+import electrosphere.server.fluid.manager.ServerFluidManager;
 import electrosphere.server.terrain.generation.OverworldChunkGenerator;
 import electrosphere.server.terrain.generation.interfaces.ChunkGenerator;
 import electrosphere.server.terrain.manager.ServerTerrainManager;
@@ -94,6 +96,7 @@ public class SaveUtils {
         if(!saveName.equals("arena")){
             Globals.serverWorldData = FileUtils.loadObjectFromSavePath(saveName, "world.json", ServerWorldData.class);
             Globals.serverTerrainManager.load(saveName);
+            Globals.serverFluidManager = new ServerFluidManager(Globals.serverTerrainManager, 2000, 50, 0, 0, new ArenaFluidGenerator());
         }
         return true;
     }
@@ -110,6 +113,7 @@ public class SaveUtils {
     
     public static boolean loadTerrainAndCreateWorldData(String currentSaveName){
         Globals.serverTerrainManager = new ServerTerrainManager(2000,50,0.0f,0,new OverworldChunkGenerator());
+        Globals.serverFluidManager = new ServerFluidManager(Globals.serverTerrainManager, 2000, 50, 0.0f, 0, new ArenaFluidGenerator());
         SaveUtils.loadTerrainAndDB(currentSaveName);
         Globals.serverWorldData = ServerWorldData.createGameWorld(Globals.serverTerrainManager);
         Globals.serverContentManager = ServerContentManager.createServerContentManager();