diff --git a/src/net/bytten/metazelda/generators/DungeonGenerator.java b/src/net/bytten/metazelda/generators/DungeonGenerator.java
index 08299f2..dab196d 100644
--- a/src/net/bytten/metazelda/generators/DungeonGenerator.java
+++ b/src/net/bytten/metazelda/generators/DungeonGenerator.java
@@ -416,7 +416,12 @@ protected boolean switchLockChildRooms(Room room,
      */
     protected List<Room> getSolutionPath() {
         List<Room> solution = new ArrayList<Room>();
-        Room room = dungeon.findGoal();
+        Room room;
+        if (isGenerateGoal()) {
+            room = dungeon.findGoal();
+        } else {
+            room = dungeon.findBoss();
+        }
         while (room != null) {
             solution.add(room);
             room = room.getParent();