diff --git a/Vocaluxe/Base/CLog.cs b/Vocaluxe/Base/CLog.cs
index 0dd53fe2..6f87a74c 100644
--- a/Vocaluxe/Base/CLog.cs
+++ b/Vocaluxe/Base/CLog.cs
@@ -117,7 +117,7 @@ namespace Vocaluxe.Base
                 MessageBox.Show(errorText, CSettings.ProgramName, MessageBoxButtons.OK, MessageBoxIcon.Error);
             if (e != null)
                 errorText += ": " + e;
-            _ErrorLog.Add(_NumErrors + ") " + errorText + "\r\n");
+            _ErrorLog.Add(_NumErrors + ") " + errorText);
             if (exit)
                 Environment.Exit(Environment.ExitCode);
         }
diff --git a/VocaluxeLib/Songs/CSongLoader.cs b/VocaluxeLib/Songs/CSongLoader.cs
index a3b2735a..b0037ee3 100644
--- a/VocaluxeLib/Songs/CSongLoader.cs
+++ b/VocaluxeLib/Songs/CSongLoader.cs
@@ -90,7 +90,7 @@ namespace VocaluxeLib.Songs
                 _Song._Comment = "";
                 _Song.ManualEncoding = false;
                 _Song.Medley.Source = EDataSource.None;
-                _Song._CalculateMedley = false;
+                _Song._CalculateMedley = true;
                 _Song.Preview.Source = EDataSource.None;
                 _Song.ShortEnd.Source = EDataSource.None;
 
diff --git a/VocaluxeLib/Songs/CSongWriter.cs b/VocaluxeLib/Songs/CSongWriter.cs
index 89d628d6..9ecf29a1 100644
--- a/VocaluxeLib/Songs/CSongWriter.cs
+++ b/VocaluxeLib/Songs/CSongWriter.cs
@@ -88,7 +88,7 @@ namespace VocaluxeLib.Songs
                 _WriteHeaderEntry("END", _Song.Finish * 1000f);
                 if (_Song.ShortEnd.Source == EDataSource.Tag)
                     _WriteHeaderEntry("ENDSHORT", (int)(CBase.Game.GetTimeFromBeats(_Song.ShortEnd.EndBeat, _Song.BPM) + _Song.Gap) * 1000);
-                if (_Song.Medley.Source == EDataSource.None)
+                if (!_Song._CalculateMedley)
                     _WriteHeaderEntry("CALCMEDLEY", "OFF");
                 if (_Song.Medley.Source == EDataSource.Tag)
                 {