diff --git a/patacrep/data/templates/songbook/songs.tex b/patacrep/data/templates/songbook/songs.tex
index ec947b60..50e23ec4 100644
--- a/patacrep/data/templates/songbook/songs.tex
+++ b/patacrep/data/templates/songbook/songs.tex
@@ -30,7 +30,6 @@
 (* block songbookpreambule *)
 (( super() ))
 
-\PassOptionsToPackage{french}{babel}
 (* for lang in _langs|sort -*)
     \PassOptionsToPackage{(( lang | lang2babel ))}{babel}
 (* endfor *)
diff --git a/patacrep/data/templates/styles/patacrep.sty b/patacrep/data/templates/styles/patacrep.sty
index 8b88af75..1712cd90 100644
--- a/patacrep/data/templates/styles/patacrep.sty
+++ b/patacrep/data/templates/styles/patacrep.sty
@@ -400,7 +400,9 @@
 \renewcommand{\textnote}[2][]{%
   \vspace{.1cm}
   \IfStrEq{}{#1}{\@textnoteold{#2}}{
-    \iflanguage{#1}{\@textnoteold{#2}}{}
+    \IfStrEq{\mainlanguage}{#1}{
+      \@textnoteold{#2}
+    }{}
   }
 }
 
@@ -408,7 +410,9 @@
 \renewcommand{\musicnote}[2][]{%
   \vspace{.1cm}
   \IfStrEq{}{#1}{\@musicnoteold{#2}}{
-    \iflanguage{#1}{\@musicnoteold{#2}}{}
+    \IfStrEq{\mainlanguage}{#1}{
+      \@musicnoteold{#2}
+    }{}
   }
 }
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/test/test_book/content.tex.control b/test/test_book/content.tex.control
index 81b62e06..38a79074 100644
--- a/test/test_book/content.tex.control
+++ b/test/test_book/content.tex.control
@@ -33,7 +33,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \PassOptionsToPackage{english}{babel}
 \PassOptionsToPackage{english}{babel}
 \usepackage[english]{babel}
diff --git a/test/test_book/datadir.tex.control b/test/test_book/datadir.tex.control
index af6f4f83..687a6096 100644
--- a/test/test_book/datadir.tex.control
+++ b/test/test_book/datadir.tex.control
@@ -35,7 +35,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \PassOptionsToPackage{english}{babel}
 \PassOptionsToPackage{english}{babel}
 \usepackage[english]{babel}
diff --git a/test/test_book/lang_de.tex.control b/test/test_book/lang_de.tex.control
index 9e2feae1..5ed6126b 100644
--- a/test/test_book/lang_de.tex.control
+++ b/test/test_book/lang_de.tex.control
@@ -42,7 +42,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \usepackage[ngerman]{babel}
 \lang{ngerman}
 
diff --git a/test/test_book/lang_default.tex.control b/test/test_book/lang_default.tex.control
index d4cc59b0..40391656 100644
--- a/test/test_book/lang_default.tex.control
+++ b/test/test_book/lang_default.tex.control
@@ -42,7 +42,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \usepackage[english]{babel}
 \lang{english}
 
diff --git a/test/test_book/lang_en.tex.control b/test/test_book/lang_en.tex.control
index 0abeb1a8..55573ddd 100644
--- a/test/test_book/lang_en.tex.control
+++ b/test/test_book/lang_en.tex.control
@@ -42,7 +42,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \usepackage[english]{babel}
 \lang{english}
 
diff --git a/test/test_book/lang_fr.tex.control b/test/test_book/lang_fr.tex.control
index 0e78844c..aca45a48 100644
--- a/test/test_book/lang_fr.tex.control
+++ b/test/test_book/lang_fr.tex.control
@@ -42,7 +42,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \usepackage[french]{babel}
 \lang{french}
 
diff --git a/test/test_book/languages.tex.control b/test/test_book/languages.tex.control
index fd31893e..a1cfa123 100644
--- a/test/test_book/languages.tex.control
+++ b/test/test_book/languages.tex.control
@@ -34,7 +34,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \PassOptionsToPackage{english}{babel}
 \PassOptionsToPackage{spanish}{babel}
 \PassOptionsToPackage{french}{babel}
diff --git a/test/test_book/onthefly/content.onthefly.tex.control b/test/test_book/onthefly/content.onthefly.tex.control
index b9041eb7..3ee52e2e 100644
--- a/test/test_book/onthefly/content.onthefly.tex.control
+++ b/test/test_book/onthefly/content.onthefly.tex.control
@@ -32,7 +32,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \PassOptionsToPackage{english}{babel}
 \PassOptionsToPackage{english}{babel}
 \usepackage[english]{babel}
diff --git a/test/test_book/special.tex.control b/test/test_book/special.tex.control
index 0dbd9614..8f7d845a 100644
--- a/test/test_book/special.tex.control
+++ b/test/test_book/special.tex.control
@@ -43,7 +43,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \PassOptionsToPackage{english}{babel}
 \usepackage[english]{babel}
 \lang{english}
diff --git a/test/test_book/syntax.tex.control b/test/test_book/syntax.tex.control
index a7518d1d..af7acb06 100644
--- a/test/test_book/syntax.tex.control
+++ b/test/test_book/syntax.tex.control
@@ -34,7 +34,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \PassOptionsToPackage{english}{babel}
 \usepackage[english]{babel}
 \lang{english}
diff --git a/test/test_book/unicode.tex.control b/test/test_book/unicode.tex.control
index 5968244d..38ce6118 100644
--- a/test/test_book/unicode.tex.control
+++ b/test/test_book/unicode.tex.control
@@ -34,7 +34,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \PassOptionsToPackage{english}{babel}
 \usepackage[english]{babel}
 \lang{english}