diff --git a/VocaluxeLib/Songs/CSong.cs b/VocaluxeLib/Songs/CSong.cs
index d2c393e8..53d2dde8 100644
--- a/VocaluxeLib/Songs/CSong.cs
+++ b/VocaluxeLib/Songs/CSong.cs
@@ -488,9 +488,11 @@ namespace VocaluxeLib.Songs
                     if (stop < (voice.Lines[series[i].Start].FirstNoteBeat + ((voice.Lines[series[i].End].LastNoteBeat - voice.Lines[series[i].Start].FirstNoteBeat) / 2)))
                     {
                         ShortEnd.EndBeat = voice.Lines[series[i].Start - 1].LastNote.EndBeat;
+                        ShortEnd.Source = EDataSource.Calculated;
                         return;
                     }
                     ShortEnd.EndBeat = voice.Lines[series[i].End].LastNote.EndBeat;
+                    ShortEnd.Source = EDataSource.Calculated;
                     return;
                 }
             }
@@ -501,6 +503,7 @@ namespace VocaluxeLib.Songs
                 if (line.FirstNoteBeat < stop && line.LastNoteBeat > stop)
                 {
                     ShortEnd.EndBeat = line.LastNoteBeat;
+                    ShortEnd.Source = EDataSource.Calculated;
                     return;
                 }
             }
diff --git a/VocaluxeLib/Songs/CSongLoader.cs b/VocaluxeLib/Songs/CSongLoader.cs
index 4556b776..26e1dea1 100644
--- a/VocaluxeLib/Songs/CSongLoader.cs
+++ b/VocaluxeLib/Songs/CSongLoader.cs
@@ -309,7 +309,7 @@ namespace VocaluxeLib.Songs
                                         _Song.ShortEnd.Source = EDataSource.Tag;
                                     }
                                     else
-                                        _LogWarning("Invalid medleyendbeat");
+                                        _LogWarning("Invalid shortendbeat");
                                 }
                                 break;
                             case "CALCMEDLEY":