diff --git a/src/main/java/org/ultramine/server/world/WorldDescriptor.java b/src/main/java/org/ultramine/server/world/WorldDescriptor.java
index caa1495..c599231 100644
--- a/src/main/java/org/ultramine/server/world/WorldDescriptor.java
+++ b/src/main/java/org/ultramine/server/world/WorldDescriptor.java
@@ -16,8 +16,10 @@
 import net.minecraft.world.WorldSettings;
 import net.minecraft.world.WorldType;
 import net.minecraft.world.chunk.storage.AnvilSaveHandler;
+import net.minecraft.world.chunk.storage.RegionFileCache;
 import net.minecraft.world.storage.ISaveFormat;
 import net.minecraft.world.storage.ISaveHandler;
+import net.minecraft.world.storage.ThreadedFileIOBase;
 import net.minecraft.world.storage.WorldInfo;
 import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.common.MinecraftForge;
@@ -332,6 +334,13 @@
 		
 		try
 		{
+			ThreadedFileIOBase.threadedIOInstance.waitForFinish();
+		} catch (InterruptedException ignored){}
+
+		RegionFileCache.clearRegionFileReferences();
+		
+		try
+		{
 			FileUtils.cleanDirectory(getDirectory());
 		}
 		catch(IOException e)