diff --git a/src/main/java/ru/bclib/api/WorldDataAPI.java b/src/main/java/ru/bclib/api/WorldDataAPI.java
index ff328660..fda603d7 100644
--- a/src/main/java/ru/bclib/api/WorldDataAPI.java
+++ b/src/main/java/ru/bclib/api/WorldDataAPI.java
@@ -24,7 +24,6 @@ public class WorldDataAPI {
 		MODS.stream().parallel().forEach(modID -> {
 			File file = new File(dataDir, modID + ".nbt");
 			CompoundTag root = new CompoundTag();
-			TAGS.put(modID, root);
 			if (file.exists()) {
 				try {
 					root = NbtIo.readCompressed(file);
@@ -46,6 +45,8 @@ public class WorldDataAPI {
 					saveFile(modID);
 				}
 			}
+			
+			TAGS.put(modID, root);
 		});
 	}
 	
diff --git a/src/main/java/ru/bclib/mixin/common/ServerLevelMixin.java b/src/main/java/ru/bclib/mixin/common/ServerLevelMixin.java
index c89822d4..58aec99b 100644
--- a/src/main/java/ru/bclib/mixin/common/ServerLevelMixin.java
+++ b/src/main/java/ru/bclib/mixin/common/ServerLevelMixin.java
@@ -16,11 +16,9 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import ru.bclib.BCLib;
 import ru.bclib.api.BiomeAPI;
-import ru.bclib.api.datafixer.DataFixerAPI;
 import ru.bclib.api.WorldDataAPI;
-import ru.bclib.config.SessionConfig;
+import ru.bclib.api.datafixer.DataFixerAPI;
 
 import java.io.File;
 import java.util.List;
@@ -51,8 +49,7 @@ public abstract class ServerLevelMixin extends Level {
 			dir = dir.getParentFile();
 		}
 		
-		//DataFixerAPI.fixData(dir);
-		DataFixerAPI.fixData(new SessionConfig(BCLib.MOD_ID, "patches", session, world));
 		WorldDataAPI.load(new File(dir, "data"));
+		DataFixerAPI.fixData(dir);
 	}
 }