diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Menus/MusicManagerMenu.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Menus/MusicManagerMenu.cs
index 9cab2cfd..ba47da50 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Menus/MusicManagerMenu.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Menus/MusicManagerMenu.cs
@@ -1255,26 +1255,26 @@ namespace StardewSymphonyRemastered.Framework.Menus
                         Vector2 position = new Vector2(this.width * .1f + 64, this.height * .05f + 320);
                         if (button.name == "SeasonIcon")
                         {
-                            //this.currentlySelectedOption = button.clone(position);
+                            this.currentlySelectedOption = button.clone(position);
                             this.drawMode = DrawMode.SeasonSelection;
                             buttonSelected = true;
                         }
                         if (button.name == "FestivalIcon")
                         {
-                            //this.currentlySelectedOption = button.clone(position);
+                            this.currentlySelectedOption = button.clone(position);
                             this.drawMode = DrawMode.FestivalSelection;
                             buttonSelected = true;
 
                         }
                         if (button.name == "EventIcon")
                         {
-                            //this.currentlySelectedOption = button.clone(position);
+                            this.currentlySelectedOption = button.clone(position);
                             this.drawMode = DrawMode.EventSelection;
                             buttonSelected = true;
                         }
                         if (button.name == "MenuIcon")
                         {
-                            //this.currentlySelectedOption = button.clone(position);
+                            this.currentlySelectedOption = button.clone(position);
                             this.drawMode = DrawMode.MenuSelection;
                             buttonSelected = true;
                         }
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs
index 45cc9c64..2d314b74 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs
@@ -174,6 +174,7 @@ namespace StardewSymphonyRemastered.Framework
                 var farm = (Farm)Game1.getLocationFromName("Farm");
                 foreach(var building in farm.buildings)
                 {
+                    if (locations.Contains(building.nameOfIndoors)) continue;
                     locations.Add(building.nameOfIndoors);
                     if (StardewSymphony.Config.EnableDebugLog)
                         StardewSymphony.ModMonitor.Log("Adding in song triggers for location: " + building.nameOfIndoors);
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/manifest.json b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/manifest.json
index 1a2867c8..30b1050a 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/manifest.json
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/manifest.json
@@ -1,7 +1,7 @@
 {
   "Name": "Stardew Symphony Remastered",
   "Author": "Alpha_Omegasis",
-  "Version": "2.1.0",
+  "Version": "2.1.1",
   "Description": "Adding more music to the game one beep at a time. Now with streaming!",
   "UniqueID": "Omegasis.StardewSymphonyRemastered",
   "EntryDll": "StardewSymphonyRemastered.dll",