Index: game/engines/default/engine/generator/map/Maze.lua
===================================================================
--- game/engines/default/engine/generator/map/Maze.lua	(revision 3212)
+++ game/engines/default/engine/generator/map/Maze.lua	(working copy)
@@ -40,6 +40,10 @@
 	local xpos, ypos = 1, 1
 	local moves = {{xpos,ypos}}
 	while #moves > 0 do
+		local pickn = rng.range(1, #moves)
+		local pick = moves[pickn]
+		xpos = pick[1]
+		ypos = pick[2]
 		local dir = {}
 		if self.map(xpos+2, ypos, Map.TERRAIN) == self.wall and xpos+2>0 and xpos+2<self.map.w-1 then
 			dir[#dir+1] = 6
@@ -75,9 +79,7 @@
 			end
 			table.insert(moves, {xpos, ypos})
 		else
-			local back = table.remove(moves)
-			xpos = back[1]
-			ypos = back[2]
+			local back = table.remove(moves,pickn)
 		end
 	end
 	-- Always starts at 1, 1