diff --git a/src/main/java/com/seibel/lod/core/api/ClientApi.java b/src/main/java/com/seibel/lod/core/api/ClientApi.java
index ccf8f6cc9..287747c15 100644
--- a/src/main/java/com/seibel/lod/core/api/ClientApi.java
+++ b/src/main/java/com/seibel/lod/core/api/ClientApi.java
@@ -81,6 +81,7 @@ public class ClientApi
 	
 	public void clientChunkLoadEvent(IChunkWrapper chunk, IWorldWrapper world)
 	{
+		//ClientApi.LOGGER.info("Lod Generating add: "+chunk.getLongChunkPos());
 		toBeLoaded.add(chunk.getLongChunkPos());
 	}
 
@@ -104,9 +105,16 @@ public class ClientApi
 				return;
 			
 			IWorldWrapper world = MC.getWrappedClientWorld();
-			LodDimension lodDim = ApiShared.lodWorld.getLodDimension(MC.getCurrentDimension());
+			if (world == null) return;
+			LodDimension lodDim = ApiShared.lodWorld.getLodDimension(world.getDimensionType());
+			
+			// Make the LodDim if it does not exist
 			if (lodDim == null)
-				return;
+			{
+				lodDim = new LodDimension(world.getDimensionType(), ApiShared.lodWorld,
+						ApiShared.lodBuilder.defaultDimensionWidthInRegions);
+				ApiShared.lodWorld.addLodDimension(lodDim);
+			}
 			
 			for (long pos : toBeLoaded) {
 				if (generating.size() >= 8) {
@@ -118,13 +126,13 @@ public class ClientApi
 					toBeLoaded.remove(pos);
 					continue;
 				}
-				if (!chunk.isLightCorrect()) continue;
+				//if (!chunk.isLightCorrect()) continue;
 				toBeLoaded.remove(pos);
 				generating.add(pos);
-				ClientApi.LOGGER.info("Lod Generation trying "+pos+". Remining: " +toBeLoaded.size());
+				//ClientApi.LOGGER.info("Lod Generation trying "+pos+". Remining: " +toBeLoaded.size());
 				ApiShared.lodBuilder.generateLodNodeAsync(chunk, ApiShared.lodWorld,
 						world.getDimensionType(), DistanceGenerationMode.FULL, true, () -> {
-							ClientApi.LOGGER.info("Lod Generation for "+pos+" done. Remining: " +toBeLoaded.size());
+							//ClientApi.LOGGER.info("Lod Generation for "+pos+" done. Remining: " +toBeLoaded.size());
 							generating.remove(pos);
 						}, () -> {
 							generating.remove(pos);
diff --git a/src/main/java/com/seibel/lod/core/api/EventApi.java b/src/main/java/com/seibel/lod/core/api/EventApi.java
index a6c528ddd..162ec4b2b 100644
--- a/src/main/java/com/seibel/lod/core/api/EventApi.java
+++ b/src/main/java/com/seibel/lod/core/api/EventApi.java
@@ -116,13 +116,6 @@ public class EventApi
 		// the player just loaded a new world/dimension
 		ApiShared.lodWorld.selectWorld(LodUtil.getWorldID(world));
 		
-		// Make the LodDim if it does not exist
-		if (ApiShared.lodWorld.getLodDimension(world.getDimensionType()) == null)
-		{
-			LodDimension lodDim = new LodDimension(world.getDimensionType(), ApiShared.lodWorld,
-					ApiShared.lodBuilder.defaultDimensionWidthInRegions);
-			ApiShared.lodWorld.addLodDimension(lodDim);
-		}
 		
 		// make sure the correct LODs are being rendered
 		// (if this isn't done the previous world's LODs may be drawn)