diff --git a/src/lighting/LightSolver.cpp b/src/lighting/LightSolver.cpp
index d67df55a..74637e64 100644
--- a/src/lighting/LightSolver.cpp
+++ b/src/lighting/LightSolver.cpp
@@ -63,11 +63,14 @@ void LightSolver::solve(){
 			int z = entry.z+coords[i*3+2];
 			Chunk* chunk = chunks->getChunkByVoxel(x,y,z);
 			if (chunk) {
+				int lx = x - chunk->x * CHUNK_W;
+				int lz = z - chunk->z * CHUNK_D;
 				chunk->setModified(true);
-				ubyte light = chunks->getLight(x,y,z, channel);
+
+				ubyte light = chunk->lightmap->get(lx,y,lz, channel);
 				if (light != 0 && light == entry.light-1){
 					remqueue.push(lightentry {x, y, z, light});
-					chunk->lightmap->set(x-chunk->x*CHUNK_W, y, z-chunk->z*CHUNK_D, channel, 0);
+					chunk->lightmap->set(lx, y, lz, channel, 0);
 				}
 				else if (light >= entry.light){
 					addqueue.push(lightentry {x, y, z, light});
@@ -87,15 +90,18 @@ void LightSolver::solve(){
 			int z = entry.z+coords[i*3+2];
 			Chunk* chunk = chunks->getChunkByVoxel(x,y,z);
 			if (chunk) {
+				int lx = x - chunk->x * CHUNK_W;
+				int lz = z - chunk->z * CHUNK_D;
 				chunk->setModified(true);
-				int light = chunk->lightmap->get(
-					x - chunk->x * CHUNK_W, y,
-					z - chunk->z * CHUNK_D,
-					channel);
-				voxel* v = chunks->get(x,y,z);
-				const Block* block = blockDefs[v->id];
+
+				ubyte light = chunk->lightmap->get(lx, y, lz, channel);
+				voxel& v = chunk->voxels[vox_index(lx, y, lz)];
+				const Block* block = blockDefs[v.id];
 				if (block->lightPassing && light+2 <= entry.light){
-					chunk->lightmap->set(x-chunk->x*CHUNK_W, y, z-chunk->z*CHUNK_D, channel, entry.light-1);
+					chunk->lightmap->set(
+						x-chunk->x*CHUNK_W, y, z-chunk->z*CHUNK_D, 
+						channel, 
+						entry.light-1);
 					addqueue.push(lightentry {x, y, z, ubyte(entry.light-1)});
 				}
 			}
diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp
index da02dadc..0d2aabb3 100644
--- a/src/logic/ChunksController.cpp
+++ b/src/logic/ChunksController.cpp
@@ -63,23 +63,24 @@ bool ChunksController::loadVisible(){
 			int index = z * w + x;
 			auto chunk = chunks->chunks[index];
 			if (chunk != nullptr){
-				int surrounding = 0;
-				for (int oz = -1; oz <= 1; oz++){
-					for (int ox = -1; ox <= 1; ox++){
-						Chunk* other = chunks->getChunk(chunk->x+ox, chunk->z+oz);
-						if (other != nullptr) surrounding++;
+				if (!chunk->isLighted()) {
+					int surrounding = 0;
+					for (int oz = -1; oz <= 1; oz++){
+						for (int ox = -1; ox <= 1; ox++){
+							Chunk* other = chunks->getChunk(chunk->x+ox, chunk->z+oz);
+							if (other != nullptr) surrounding++;
+						}
+					}
+					chunk->surrounding = surrounding;
+					if (surrounding == MIN_SURROUNDING) {
+						bool lightsCache = chunk->isLoadedLights();
+						if (!lightsCache) {
+							lighting->buildSkyLight(chunk->x, chunk->z);
+						}
+						lighting->onChunkLoaded(chunk->x, chunk->z, !lightsCache);
+						chunk->setLighted(true);
+						return true;
 					}
-				}
-				chunk->surrounding = surrounding;
-				if (surrounding == MIN_SURROUNDING && !chunk->isLighted()) {
-					timeutil::ScopeLogTimer log(555);
-					bool lightsCache = chunk->isLoadedLights();
-					if (!lightsCache) {
-						lighting->buildSkyLight(chunk->x, chunk->z);
-                    }
-                    lighting->onChunkLoaded(chunk->x, chunk->z, !lightsCache);
-					chunk->setLighted(true);
-					return true;
 				}
 				continue;
 			}