diff --git a/EHR.csproj b/EHR.csproj
index 0c510ce39..fa37a85ec 100644
--- a/EHR.csproj
+++ b/EHR.csproj
@@ -14,7 +14,6 @@
         <Authors>Gurge44</Authors>
         <LangVersion>preview</LangVersion>
         <AmongUs>$(AmongUsPath)</AmongUs>
-        <!--<AmongUs>C:\Program Files\Epic Games\AmongUs</AmongUs>-->
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <Optimize>True</Optimize>
         <AssemblyName>$(MSBuildProjectName)</AssemblyName>
diff --git a/Gamemodes/Quiz.cs b/Gamemodes/Quiz.cs
index b2be6a858..d4928e812 100644
--- a/Gamemodes/Quiz.cs
+++ b/Gamemodes/Quiz.cs
@@ -36,7 +36,7 @@ public static class Quiz
             ['B'] = SystemTypes.UpperEngine,
             ['C'] = SystemTypes.Security,
             ['D'] = SystemTypes.LowerEngine,
-            ['E'] = SystemTypes.Hallway
+            ['E'] = SystemTypes.Outside
         },
         [MapNames.MiraHQ] = new()
         {
@@ -183,7 +183,7 @@ public static class Quiz
                     char letter = (char)('A' + i);
                     SystemTypes room = UsedRooms[Main.CurrentMap][letter];
 
-                    bool isInThisRoom = room == SystemTypes.Outside ? seer.GetPlainShipRoom() == null : seer.IsInRoom(room);
+                    bool isInThisRoom = room == SystemTypes.Outside ? seer.GetPlainShipRoom() == null || seer.IsInRoom(SystemTypes.Hallway) : seer.IsInRoom(room);
 
                     string prefix = isInThisRoom ? "\u27a1 <u>" : string.Empty;
                     string suffix = isInThisRoom ? "</u>" : string.Empty;
@@ -449,7 +449,7 @@ public static class Quiz
         QuestionTimeLimitEndTS = 0;
         PlayerControl[] aapc = Main.AllAlivePlayerControls;
         SystemTypes correctRoom = UsedRooms[Main.CurrentMap][(char)('A' + CurrentQuestion.CorrectAnswerIndex)];
-        DyingPlayers = aapc.Select(x => (ID: x.PlayerId, Room: x.GetPlainShipRoom())).Where(x => correctRoom == SystemTypes.Outside ? x.Room != null : x.Room == null || x.Room.RoomId != correctRoom).Select(x => x.ID).ToList();
+        DyingPlayers = aapc.Select(x => (ID: x.PlayerId, Room: x.GetPlainShipRoom())).Where(x => correctRoom == SystemTypes.Outside ? x.Room != null && x.Room.RoomId != SystemTypes.Hallway : x.Room == null || x.Room.RoomId != correctRoom).Select(x => x.ID).ToList();
         if (DyingPlayers.Count == 0) NumAllCorrectAnswers++;
         bool everyoneWasWrong = DyingPlayers.Count == aapc.Length;
         if (!everyoneWasWrong) NumCorrectAnswers.IntersectBy(aapc.Select(x => x.PlayerId), x => x.Key).DoIf(x => !DyingPlayers.Contains(x.Key), x => x.Value[CurrentDifficulty][Round]++);
@@ -590,7 +590,7 @@ public static class Quiz
                     if (CurrentDifficulty == Difficulty.Test)
                     {
                         SystemTypes correctRoom = UsedRooms[Main.CurrentMap][(char)('A' + CurrentQuestion.CorrectAnswerIndex)];
-                        DyingPlayers = Main.AllAlivePlayerControls.Select(x => (ID: x.PlayerId, Room: x.GetPlainShipRoom())).Where(x => correctRoom == SystemTypes.Outside ? x.Room != null : x.Room == null || x.Room.RoomId != correctRoom).Select(x => x.ID).ToList();
+                        DyingPlayers = Main.AllAlivePlayerControls.Select(x => (ID: x.PlayerId, Room: x.GetPlainShipRoom())).Where(x => correctRoom == SystemTypes.Outside ? x.Room != null && x.Room.RoomId != SystemTypes.Hallway : x.Room == null || x.Room.RoomId != correctRoom).Select(x => x.ID).ToList();
                         QuestionTimeLimitEndTS = 0;
                         Utils.NotifyRoles();
                     }
diff --git a/Main.cs b/Main.cs
index 392572355..0ba101a7b 100644
--- a/Main.cs
+++ b/Main.cs
@@ -42,8 +42,8 @@ public class Main : BasePlugin
     private const string DebugKeyHash = "c0fd562955ba56af3ae20d7ec9e64c664f0facecef4b3e366e109306adeae29d";
     private const string DebugKeySalt = "59687b";
     private const string PluginGuid = "com.gurge44.endlesshostroles";
-    public const string PluginVersion = "7.0.2";
-    public const string PluginDisplayVersion = "7.0.2";
+    public const string PluginVersion = "7.1.0";
+    public const string PluginDisplayVersion = "7.1.0";
     public const bool TestBuild = false;
 
     public const string NeutralColor = "#ffab1b";