diff --git a/YAMS-LIB/MusicShuffle.cs b/YAMS-LIB/MusicShuffle.cs
index 90e4a30..ab474e0 100644
--- a/YAMS-LIB/MusicShuffle.cs
+++ b/YAMS-LIB/MusicShuffle.cs
@@ -24,7 +24,7 @@ public static void ShuffleMusic(string musicDirectory, Dictionary<string, string
             musicFile.MoveTo(musicFile.FullName + "_");
 
         // Then we go through each song in the dictionary
-        foreach ((var origSongName, var newSongName) in musicDict)
+        foreach ((var newSongName, var origSongName) in musicDict)
         {
             if (File.Exists(musicDirectory + "/" + origSongName + "_"))
                 File.Move(musicDirectory + "/" + origSongName + "_", musicDirectory + "/" + newSongName);
diff --git a/YAMS-LIB/Program.cs b/YAMS-LIB/Program.cs
index e866894..b3522f6 100644
--- a/YAMS-LIB/Program.cs
+++ b/YAMS-LIB/Program.cs
@@ -622,6 +622,9 @@ void RotateTextureAndSaveToTexturePage(int rotation, UndertaleTexturePageItem te
         
         // Shuffle Music
         MusicShuffle.ShuffleMusic(Path.GetDirectoryName(outputAm2rPath), seedObject.Cosmetics.MusicShuffleDict);
+        // Fix annoying overlapping songs when fanfare is long song.
+        PrependGMLInCode(gmData.Code.ByName("gml_Object_oMusicV2_Alarm_0"), "if (sfx_isplaying(musFanfare)) audio_stop_sound(musFanfare)");
+        ReplaceGMLInCode(gmData.Code.ByName("gml_Script_mus_intro_fanfare"), "alarm[0] = 60", "alarm[0] = 330");
 
 
         // Create new wisdom septogg object