diff --git a/HEADS b/HEADS
index f2eeac8c..97636770 100644
--- a/HEADS
+++ b/HEADS
@@ -1 +1 @@
-{"engine": {"3.2": "0d5e483a90c41c433056b8cf6e4e8def6316690f", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "3e10779dbc5258d1e1b08eab287189f9c1ccec64"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "59291a9417db2e1ba3a5fc5dc6ae2e8cdda1b09a"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "ba464ef04500aa01b2638cf1f890f3f6582ead84"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}}
\ No newline at end of file
+{"engine": {"3.2": "0d5e483a90c41c433056b8cf6e4e8def6316690f", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "3e10779dbc5258d1e1b08eab287189f9c1ccec64"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "d08da0375a121b43de3f4e2b7807f801b85ec598"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "ba464ef04500aa01b2638cf1f890f3f6582ead84"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}}
\ No newline at end of file
diff --git a/game/voxelman/world/TVVoxelWorld.gd b/game/voxelman/world/TVVoxelWorld.gd
index ecd8223d..55fa02a3 100644
--- a/game/voxelman/world/TVVoxelWorld.gd
+++ b/game/voxelman/world/TVVoxelWorld.gd
@@ -123,7 +123,8 @@ func _process(delta):
 #				get_node("..").hide_loading_screen()
 
 func _generation_finished():
-	max_frame_chunk_build_steps = _max_frame_chunk_build_temp
+	if not Engine.editor_hint:
+		max_frame_chunk_build_steps = _max_frame_chunk_build_temp
 	
 	initial_generation = false
 	
@@ -180,8 +181,9 @@ func _create_chunk(x : int, y : int, z : int, pchunk : Node) -> VoxelChunk:
 	return ._create_chunk(x, y, z, chunk)
 	
 func spawn() -> void:
-	_max_frame_chunk_build_temp = max_frame_chunk_build_steps
-	max_frame_chunk_build_steps = 0
+	if not Engine.editor_hint:
+		_max_frame_chunk_build_temp = max_frame_chunk_build_steps
+		max_frame_chunk_build_steps = 0
 	
 	for x in range(-chunk_spawn_range, chunk_spawn_range):
 		for z in range(-chunk_spawn_range, chunk_spawn_range):