diff --git a/VocaluxeLib/Songs/CSong.cs b/VocaluxeLib/Songs/CSong.cs
index 45f5af1f..aa0ced4b 100644
--- a/VocaluxeLib/Songs/CSong.cs
+++ b/VocaluxeLib/Songs/CSong.cs
@@ -319,6 +319,7 @@ namespace VocaluxeLib.Songs
                 List<string> files = CHelper.ListFiles(Folder, "*.jpg");
                 files.AddRange(CHelper.ListFiles(Folder, "*.jpeg"));
                 files.AddRange(CHelper.ListFiles(Folder, "*.png"));
+                files.AddRange(CHelper.ListFiles(Folder, "*.gif"));
                 foreach (String file in files)
                 {
                     if (file.ContainsIgnoreCase("[CO]") &&
@@ -332,6 +333,7 @@ namespace VocaluxeLib.Songs
                 List<string> files = CHelper.ListFiles(Folder, "*.jpg");
                 files.AddRange(CHelper.ListFiles(Folder, "*.jpeg"));
                 files.AddRange(CHelper.ListFiles(Folder, "*.png"));
+                files.AddRange(CHelper.ListFiles(Folder, "*.gif"));
                 foreach (String file in files)
                 {
                     if (file.ContainsIgnoreCase("[BG]") &&
diff --git a/VocaluxeLib/Songs/CSongLoader.cs b/VocaluxeLib/Songs/CSongLoader.cs
index b0037ee3..459b554b 100644
--- a/VocaluxeLib/Songs/CSongLoader.cs
+++ b/VocaluxeLib/Songs/CSongLoader.cs
@@ -714,7 +714,10 @@ namespace VocaluxeLib.Songs
                     string msg = "Automatic changes have been made to " + filePath + " Please check result!\r\n" + changesMade;
                     CBase.Log.LogError("Warning:" + msg);
                     if (CBase.Config.GetSaveModifiedSongs() == EOffOn.TR_CONFIG_ON)
-                        _Song.Save(filePath + ".fix");
+                    {
+                        string name = Path.GetFileNameWithoutExtension(_Song.FileName);
+                        _Song.Save(Path.Combine(_Song.Folder, name + ".fix"));
+                    }
                 }
                 return true;
             }