diff --git a/Output/x64/acinerella.dll b/Output/x64/acinerella.dll
index e851fd01..c57d9661 100644
Binary files a/Output/x64/acinerella.dll and b/Output/x64/acinerella.dll differ
diff --git a/Output/x64/avcodec-54.dll b/Output/x64/avcodec-54.dll
index ca074e7c..3906d3bf 100644
Binary files a/Output/x64/avcodec-54.dll and b/Output/x64/avcodec-54.dll differ
diff --git a/Output/x64/avformat-54.dll b/Output/x64/avformat-54.dll
index 40521b17..9b9f360f 100644
Binary files a/Output/x64/avformat-54.dll and b/Output/x64/avformat-54.dll differ
diff --git a/Output/x64/avutil-51.dll b/Output/x64/avutil-51.dll
deleted file mode 100644
index 5f8cdf7d..00000000
Binary files a/Output/x64/avutil-51.dll and /dev/null differ
diff --git a/Output/x64/avutil-52.dll b/Output/x64/avutil-52.dll
new file mode 100644
index 00000000..025a4bf1
Binary files /dev/null and b/Output/x64/avutil-52.dll differ
diff --git a/Output/x64/swresample-0.dll b/Output/x64/swresample-0.dll
new file mode 100644
index 00000000..026fe92d
Binary files /dev/null and b/Output/x64/swresample-0.dll differ
diff --git a/Output/x64/swscale-2.dll b/Output/x64/swscale-2.dll
index dcc41fd3..2b915705 100644
Binary files a/Output/x64/swscale-2.dll and b/Output/x64/swscale-2.dll differ
diff --git a/Output/x86/acinerella.dll b/Output/x86/acinerella.dll
index a39e3501..e4dc5ce2 100644
Binary files a/Output/x86/acinerella.dll and b/Output/x86/acinerella.dll differ
diff --git a/Output/x86/avcodec-54.dll b/Output/x86/avcodec-54.dll
index 97d7f850..d6e72cb7 100644
Binary files a/Output/x86/avcodec-54.dll and b/Output/x86/avcodec-54.dll differ
diff --git a/Output/x86/avformat-54.dll b/Output/x86/avformat-54.dll
index 7328c561..d1233b57 100644
Binary files a/Output/x86/avformat-54.dll and b/Output/x86/avformat-54.dll differ
diff --git a/Output/x86/avutil-51.dll b/Output/x86/avutil-51.dll
deleted file mode 100644
index 5ab61687..00000000
Binary files a/Output/x86/avutil-51.dll and /dev/null differ
diff --git a/Output/x86/avutil-52.dll b/Output/x86/avutil-52.dll
new file mode 100644
index 00000000..98791159
Binary files /dev/null and b/Output/x86/avutil-52.dll differ
diff --git a/Output/x86/swresample-0.dll b/Output/x86/swresample-0.dll
new file mode 100644
index 00000000..e546c3c7
Binary files /dev/null and b/Output/x86/swresample-0.dll differ
diff --git a/Output/x86/swscale-2.dll b/Output/x86/swscale-2.dll
index afa902a0..200ebf30 100644
Binary files a/Output/x86/swscale-2.dll and b/Output/x86/swscale-2.dll differ
diff --git a/Vocaluxe/Base/CBackgroundMusic.cs b/Vocaluxe/Base/CBackgroundMusic.cs
index 848fa6bd..9284b73c 100644
--- a/Vocaluxe/Base/CBackgroundMusic.cs
+++ b/Vocaluxe/Base/CBackgroundMusic.cs
@@ -211,6 +211,7 @@ namespace Vocaluxe.Base
                 _Video = -1;
             }
             CSound.FadeAndStop(_CurrentMusicStream, 0f, CSettings.BackgroundMusicFadeTime);
+            _CurrentMusicStream = -1;
 
             _CurrentPlaylistElement = new PlaylistElement();
             _Playing = false;
@@ -242,6 +243,7 @@ namespace Vocaluxe.Base
 
                 bool finished = CSound.IsFinished(_CurrentMusicStream);
                 if (_Playing && (timeToPlay <= CSettings.BackgroundMusicFadeTime || finished))
+                {
                     if (_RepeatSong)
                     {
                         CSound.SetPosition(_CurrentMusicStream, 0);
@@ -250,6 +252,7 @@ namespace Vocaluxe.Base
                     }
                     else
                         Next();
+                }
             }
         }
 
diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs
index 9e95fdd4..13afb5a5 100644
--- a/Vocaluxe/Screens/CScreenSing.cs
+++ b/Vocaluxe/Screens/CScreenSing.cs
@@ -438,7 +438,7 @@ namespace Vocaluxe.Screens
             UpdateNames();
 
             CBackgroundMusic.Disabled = true;
-
+            CloseSong();
         }
 
         public override void OnShowFinish()
@@ -573,6 +573,8 @@ namespace Vocaluxe.Screens
 
         private void LoadNextSong()
         {
+            CloseSong();
+
             CGame.NextRound();
 
             if (CGame.IsFinished())
@@ -589,8 +591,6 @@ namespace Vocaluxe.Screens
                 return;
             }
 
-            CloseSong();
-
             if (!song.CoverSmallLoaded)
                 song.ReadNotes();