diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java
index 46d173051..d5cab2c94 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java
@@ -283,12 +283,14 @@ public abstract class RegularLevel extends Level {
 				}
 			}
 		}
-		
+
 		while (count < 6) {
-			Room r = randomRoom( Type.TUNNEL, 1 );
+			Room r = randomRoom( Type.TUNNEL, 20 );
 			if (r != null) {
 				r.type = Type.STANDARD;
 				count++;
+			} else {
+				return false;
 			}
 		}