diff --git a/mods/MAPGEN/mcl_mapgen_core/init.lua b/mods/MAPGEN/mcl_mapgen_core/init.lua
index b3f1c2db..05c88cf5 100644
--- a/mods/MAPGEN/mcl_mapgen_core/init.lua
+++ b/mods/MAPGEN/mcl_mapgen_core/init.lua
@@ -2159,7 +2159,7 @@ local function basic(vm, data, data2, emin, emax, area, minp, maxp, blockseed)
 			if mg_name == "v6" then
 				nodes = minetest.find_nodes_in_area(emin, emax, {"mcl_core:water_source", "mcl_core:stone", "mcl_core:sand", "mcl_core:dirt"})
 			else
-				nodes = minetest.find_nodes_in_area(emin, emax, {"mcl_core:water_source"})
+				nodes = minetest.find_nodes_in_area(emin, emax, {"mcl_core:water_source", "mcl_core:stone"})
 			end
 			for n=1, #nodes do
 				local p_pos = area:index(nodes[n].x, nodes[n].y, nodes[n].z)
@@ -2167,7 +2167,13 @@ local function basic(vm, data, data2, emin, emax, area, minp, maxp, blockseed)
 					data[p_pos] = c_nether_lava
 					lvm_used = true
 				elseif data[p_pos] == c_stone then
-					data[p_pos] = c_netherrack
+					-- this deals with random stone layers Minetest creates
+					-- see https://github.com/minetest/minetest/issues/9357
+					if nodes[n].y > mcl_vars.mg_bedrock_nether_top_max then
+						data[p_pos] = c_air  -- remove stone clouds
+					else
+						data[p_pos] = c_netherrack  -- remove stone
+					end
 					lvm_used = true
 				elseif data[p_pos] == c_sand or data[p_pos] == c_dirt then
 					data[p_pos] = c_soul_sand