@@ -70,11 +70,11 @@
 		const(Pos)[] hi = g.map.objects('W');
 
 		Tuple!(char,int)[] cand;
 		char c = 'W';
-		if( la.empty ) {
+		if( g.map.collected_lambda == g.map.total_lambda ) {
 			cand = search(g, ro, [li], death);
-		} else {
+		} else if( !la.empty ){
 			cand ~= search(g, ro, la~ra, death);
 		}
 
 		// 'higesori' mode
@@ -388,6 +388,6 @@
 			plan = plan[1..$];
 	}
 }
 
-alias Solver_2!(Solver_1) MainSolver;
-//alias Solver_1 MainSolver;
+//alias Solver_2!(Solver_1) MainSolver;
+alias Solver_1 MainSolver;