diff --git a/source/settings.cpp b/source/settings.cpp
index 2db780f..1422cc3 100644
--- a/source/settings.cpp
+++ b/source/settings.cpp
@@ -911,10 +911,18 @@ namespace Settings {
     ctx.startingSwampTokens = StartingSwampToken.Value<u8>();
     ctx.startingOceanTokens = StartingOceanToken.Value<u8>();
     //Stray Fairies
-    ctx.startingWoodfallStrays = StartingWoodfallStrays.Value<u8>();
-    ctx.startingSnowheadStrays = StartingSnowheadStrays.Value<u8>();
-    ctx.startingGreatBayStrays = StartingGreatBayStrays.Value<u8>();
-    ctx.startingStoneTowerStrays = StartingStoneTowerStrays.Value<u8>();
+    if (StrayFairysanity.Value<u8>() == 1/*Start With*/) {
+      ctx.startingWoodfallStrays = 15;
+      ctx.startingSnowheadStrays = 15;
+      ctx.startingGreatBayStrays = 15;
+      ctx.startingStoneTowerStrays = 15;
+    }
+    else { /*Do whatever the starting values are*/
+      ctx.startingWoodfallStrays = StartingWoodfallStrays.Value<u8>();
+      ctx.startingSnowheadStrays = StartingSnowheadStrays.Value<u8>();
+      ctx.startingGreatBayStrays = StartingGreatBayStrays.Value<u8>();
+      ctx.startingStoneTowerStrays = StartingStoneTowerStrays.Value<u8>();
+    }
     //Masks
     ctx.startingDekuMask = StartingDekuMask.Value<u8>();
     ctx.startingGoronMask = StartingGoronMask.Value<u8>();
diff --git a/source/starting_inventory.cpp b/source/starting_inventory.cpp
index 5c7b4c6..5841379 100644
--- a/source/starting_inventory.cpp
+++ b/source/starting_inventory.cpp
@@ -59,6 +59,12 @@ void GenerateStartingInventory() {
     AddItemToInventory(GBT_STRAY_FAIRY, 15);
     AddItemToInventory(ST_STRAY_FAIRY, 15);
   }
+  else {
+    AddItemToInventory(WF_STRAY_FAIRY,            StartingWoodfallStrays.Value<u8>());
+    AddItemToInventory(SH_STRAY_FAIRY,            StartingSnowheadStrays.Value<u8>());
+    AddItemToInventory(GBT_STRAY_FAIRY,           StartingGreatBayStrays.Value<u8>());
+    AddItemToInventory(ST_STRAY_FAIRY,            StartingStoneTowerStrays.Value<u8>());
+  }
   
   //Starting Inventory Menu
   //Values are associated so that the count of items matches the index of
@@ -113,10 +119,6 @@ void GenerateStartingInventory() {
   AddItemToInventory(TWINMOLDS_REMAINS,         StartingTwinmoldRemains.Value<u8>());
   AddItemToInventory(SWAMP_SKULLTULA_TOKEN,     StartingSwampToken.Value<u8>());
   AddItemToInventory(OCEANSIDE_SKULLTULA_TOKEN, StartingOceanToken.Value<u8>());
-  AddItemToInventory(WF_STRAY_FAIRY,            StartingWoodfallStrays.Value<u8>());
-  AddItemToInventory(SH_STRAY_FAIRY,            StartingSnowheadStrays.Value<u8>());
-  AddItemToInventory(GBT_STRAY_FAIRY,           StartingGreatBayStrays.Value<u8>());
-  AddItemToInventory(ST_STRAY_FAIRY,            StartingStoneTowerStrays.Value<u8>());
 
   AddItemToInventory(DEKU_MASK,                 StartingDekuMask.Value<u8>());  
   AddItemToInventory(GORON_MASK,                StartingGoronMask.Value<u8>());