diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 75c883605b..d47b8cf665 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -2269,9 +2269,9 @@ GetItemID Randomizer::GetItemFromGet(RandomizerGet randoGet, GetItemID ogItemId)
             return GI_COMPASS;
 
         case RG_FOREST_TEMPLE_BOSS_KEY:
-            return GI_FIRE_TEMPLE_BOSS_KEY;
-        case RG_FIRE_TEMPLE_BOSS_KEY:
             return GI_FOREST_TEMPLE_BOSS_KEY;
+        case RG_FIRE_TEMPLE_BOSS_KEY:
+            return GI_FIRE_TEMPLE_BOSS_KEY;
         case RG_WATER_TEMPLE_BOSS_KEY:
             return GI_WATER_TEMPLE_BOSS_KEY;
         case RG_SPIRIT_TEMPLE_BOSS_KEY:
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 668637cf1a..eb02c14f2b 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -1772,7 +1772,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
                 break;
         }
     
-        gSaveContext.inventory.dungeonItems[gSaveContext.mapIndex] |= gBitFlags[item - ITEM_KEY_BOSS];
+        gSaveContext.inventory.dungeonItems[mapIndex] |= gBitFlags[ITEM_KEY_BOSS - ITEM_KEY_BOSS];
     } else if ((item >= ITEM_GERUDO_FORTRESS_SMALL_KEY) && (item <= ITEM_GANONS_CASTLE_SMALL_KEY)) {
         int mapIndex = gSaveContext.mapIndex;
         switch (item) {