diff --git a/Plugin Plant/src/main/java/net/simon987/biomassplugin/event/ObjectDeathListener.java b/Plugin Plant/src/main/java/net/simon987/biomassplugin/event/ObjectDeathListener.java
index 6ace72f..45788c0 100644
--- a/Plugin Plant/src/main/java/net/simon987/biomassplugin/event/ObjectDeathListener.java	
+++ b/Plugin Plant/src/main/java/net/simon987/biomassplugin/event/ObjectDeathListener.java	
@@ -36,8 +36,8 @@ public class ObjectDeathListener implements GameEventListener {
 
 
             //Don't spawn biomass on World border
-            if (dyingHarvesterNPC.getX() != 0 && dyingHarvesterNPC.getX() != World.WORLD_SIZE - 1 &&
-                    dyingHarvesterNPC.getY() != 0 && dyingHarvesterNPC.getY() != World.WORLD_SIZE - 1) {
+            if (dyingHarvesterNPC.getX() != 0 && dyingHarvesterNPC.getX() != dyingHarvesterNPC.getWorld().getWorldSize() - 1 &&
+                    dyingHarvesterNPC.getY() != 0 && dyingHarvesterNPC.getY() != dyingHarvesterNPC.getWorld().getWorldSize() - 1) {
                 //Create a new biomass
                 BiomassBlob newBiomassBlob = createBiomassBlobAt(
                         dyingHarvesterNPC.getX(), dyingHarvesterNPC.getY(), dyingHarvesterNPC.getWorld());
diff --git a/Server/src/main/java/net/simon987/server/game/WorldGenerator.java b/Server/src/main/java/net/simon987/server/game/WorldGenerator.java
index 0c0028f..37066b6 100755
--- a/Server/src/main/java/net/simon987/server/game/WorldGenerator.java
+++ b/Server/src/main/java/net/simon987/server/game/WorldGenerator.java
@@ -35,7 +35,7 @@ public class WorldGenerator {
     private int minCopperCount;
     private int maxCopperCount;
 
-    private static final int DEFAULT_WORLD_SIZE = 24;
+    private static final int DEFAULT_WORLD_SIZE = 16;
 
     /**
      * Map of center points