diff --git a/P3D/Resources/Sound/MusicManager.vb b/P3D/Resources/Sound/MusicManager.vb
index 61c18585c..8c3749e43 100644
--- a/P3D/Resources/Sound/MusicManager.vb
+++ b/P3D/Resources/Sound/MusicManager.vb
@@ -308,6 +308,10 @@ Public Class MusicManager
                 'End If
                 'End If
                 'End If
+            Else
+                If _isFadingIn = False Then
+                    _isCurrentlyFading = False
+                End If
             End If
         End If
 
diff --git a/P3D/World/ActionScript/V2/ScriptCommands/DoMusic.vb b/P3D/World/ActionScript/V2/ScriptCommands/DoMusic.vb
index 949d458ae..994e7471a 100644
--- a/P3D/World/ActionScript/V2/ScriptCommands/DoMusic.vb
+++ b/P3D/World/ActionScript/V2/ScriptCommands/DoMusic.vb
@@ -32,7 +32,7 @@
 
                     If LoopSong = True Then
                         If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then
-                            Screen.Level.MusicLoop = argument
+                            Screen.Level.MusicLoop = argument.GetSplit(0, ",")
                         End If
                     Else
                         If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then
@@ -57,7 +57,7 @@
 
                     If LoopSong = True Then
                         If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then
-                            Screen.Level.MusicLoop = argument
+                            Screen.Level.MusicLoop = argument.GetSplit(0, ",")
                         End If
                     Else
                         If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then