2 files changed, 4 insertions, 6 deletions
diff --git a/src/base/USong.pas b/src/base/USong.pas
index 4f35d774..a8581ebd 100644
--- a/src/base/USong.pas
+++ b/src/base/USong.pas
@@ -623,7 +623,9 @@ begin
       Lines[Count].Line[High(Lines[Count].Line)].LastLine := true;
   end;
 
-  Result := true;
+  FindRefrain();
+
+	Result := true;
 end;
 
 //Load XML Song
@@ -1581,10 +1583,6 @@ begin
 
     //Load Song for Medley Tags
     CurrentSong := self;
-    Result := Result and LoadSong();
-
-    if Result then
-      Self.FindRefrain();
   finally
     SongFile.Free;
   end;
diff --git a/src/screens/UScreenSing.pas b/src/screens/UScreenSing.pas
index f26b8cf7..e69e3f56 100644
--- a/src/screens/UScreenSing.pas
+++ b/src/screens/UScreenSing.pas
@@ -770,7 +770,7 @@ begin
     if CurrentSong.FileName.GetExtension.ToUTF8 = '.xml' then
       success := CurrentSong.AnalyseXML and CurrentSong.LoadXMLSong()
     else
-      success := CurrentSong.Analyse; // and CurrentSong.LoadSong();
+      success := CurrentSong.Analyse and CurrentSong.LoadSong();
   except
     success := false;
   end;