diff --git a/abms.lua b/abms.lua
index e98ce97..c04df5a 100644
--- a/abms.lua
+++ b/abms.lua
@@ -438,8 +438,8 @@ minetest.register_abm({
 minetest.register_abm({
 	nodenames = {"fun_caves:dungeon_wall_1"},
 	neighbors = {'air'},
-	interval = time_factor,
-	chance = 100,
+	interval = 1 * time_factor,
+	chance = 1000,
 	catch_up = false,
 	action = function(pos, node)
 		if not (pos and node) then
diff --git a/mapgen.lua b/mapgen.lua
index 9db0aad..2e87d28 100644
--- a/mapgen.lua
+++ b/mapgen.lua
@@ -455,7 +455,7 @@ local function generate(p_minp, p_maxp, seed)
 			end
 		end
 
-		if fun_caves.dungeon then
+		if not underzone and fun_caves.dungeon then
 			local write_dungeon, write_p4
 			write_dungeon, write_p4 = fun_caves.dungeon(minp, maxp, data, p2data, area, node, heightmap)
 			if write_dungeon then