diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_13.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_13.java
index fceb4aa7..c0268890 100644
--- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_13.java
+++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_13.java
@@ -38,9 +38,6 @@ import org.jetbrains.annotations.Nullable;
 
 public class Chunk_1_13 extends MCAChunk {
 
-    private static final Level EMPTY_LEVEL = new Level();
-    private static final HeightmapsData EMPTY_HEIGHTMAPS_DATA = new HeightmapsData();
-
     private static final Key STATUS_EMPTY = new Key("minecraft", "empty");
     private static final Key STATUS_FULL = new Key("minecraft", "full");
     private static final Key STATUS_FULLCHUNK = new Key("minecraft", "fullchunk");
@@ -265,7 +262,7 @@ public class Chunk_1_13 extends MCAChunk {
     @Getter
     @SuppressWarnings("FieldMayBeFinal")
     public static class Data extends MCAChunk.Data {
-        private Level level = EMPTY_LEVEL;
+        private Level level = new Level();
     }
 
     @Getter
@@ -273,7 +270,7 @@ public class Chunk_1_13 extends MCAChunk {
     public static class Level {
         private Key status = STATUS_EMPTY;
         private long inhabitedTime = 0;
-        private HeightmapsData heightmaps = EMPTY_HEIGHTMAPS_DATA;
+        private HeightmapsData heightmaps = new HeightmapsData();
         private SectionData @Nullable [] sections = null;
         private int[] biomes = EMPTY_INT_ARRAY;
     }
diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_16.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_16.java
index 2d7ef716..ed9f336f 100644
--- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_16.java
+++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_16.java
@@ -39,9 +39,6 @@ import org.jetbrains.annotations.Nullable;
 
 public class Chunk_1_16 extends MCAChunk {
 
-    private static final Level EMPTY_LEVEL = new Level();
-    private static final HeightmapsData EMPTY_HEIGHTMAPS_DATA = new HeightmapsData();
-
     private static final Key STATUS_EMPTY = new Key("minecraft", "empty");
     private static final Key STATUS_FULL = new Key("minecraft", "full");
 
@@ -253,7 +250,7 @@ public class Chunk_1_16 extends MCAChunk {
     @Getter
     @SuppressWarnings("FieldMayBeFinal")
     public static class Data extends MCAChunk.Data {
-        private Level level = EMPTY_LEVEL;
+        private Level level = new Level();
     }
 
     @Getter
@@ -261,7 +258,7 @@ public class Chunk_1_16 extends MCAChunk {
     public static class Level {
         private Key status = STATUS_EMPTY;
         private long inhabitedTime = 0;
-        private HeightmapsData heightmaps = EMPTY_HEIGHTMAPS_DATA;
+        private HeightmapsData heightmaps = new HeightmapsData();
         private SectionData @Nullable [] sections = null;
         private int[] biomes = EMPTY_INT_ARRAY;
     }
diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_18.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_18.java
index 27aaec64..3c91351f 100644
--- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_18.java
+++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_18.java
@@ -39,10 +39,6 @@ import org.jetbrains.annotations.Nullable;
 
 public class Chunk_1_18 extends MCAChunk {
 
-    private static final BlockStatesData EMPTY_BLOCKSTATESDATA = new BlockStatesData();
-    private static final BiomesData EMPTY_BIOMESDATA = new BiomesData();
-    private static final HeightmapsData EMPTY_HEIGHTMAPS_DATA = new HeightmapsData();
-
     private static final Key STATUS_EMPTY = new Key("minecraft", "empty");
     private static final Key STATUS_FULL = new Key("minecraft", "full");
 
@@ -265,7 +261,7 @@ public class Chunk_1_18 extends MCAChunk {
     public static class Data extends MCAChunk.Data {
         private Key status = STATUS_EMPTY;
         private long inhabitedTime = 0;
-        private HeightmapsData heightmaps = EMPTY_HEIGHTMAPS_DATA;
+        private HeightmapsData heightmaps = new HeightmapsData();
         private SectionData @Nullable [] sections = null;
     }
 
@@ -282,8 +278,8 @@ public class Chunk_1_18 extends MCAChunk {
         private int y = 0;
         private byte[] blockLight = EMPTY_BYTE_ARRAY;
         private byte[] skyLight = EMPTY_BYTE_ARRAY;
-        @NBTName("block_states") private BlockStatesData blockStates = EMPTY_BLOCKSTATESDATA;
-        private BiomesData biomes = EMPTY_BIOMESDATA;
+        @NBTName("block_states") private BlockStatesData blockStates = new BlockStatesData();
+        private BiomesData biomes = new BiomesData();
     }
 
     @Getter