diff --git a/sbabook.cls b/sbabook.cls
index 4c263e2..b99b41d 100644
--- a/sbabook.cls
+++ b/sbabook.cls
@@ -46,6 +46,9 @@
 
 \setmainfont{Gentium Book Basic}
 \setsansfont{Open Sans}[
+  \@ifpackagelater{opensans}{2019/06/19}% test for font naming bug
+    {}% 2019/06/20 fixed it
+    {BoldFont = {* Bold},}
   Scale=MatchLowercase,
   Numbers=OldStyle
 ]
@@ -56,10 +59,6 @@
   % alternative solution: \usepackage[htt]{hyphenat}
 ]
 
-\@ifpackagelater{opensans}{2019/06/19}
-  {}% we're all good
-  {\defaultfontfeatures[Open Sans]{BoldFont = {* Bold}}}% workaround naming bug
-
 \let\codefamily\ttfamily
 \newcommand\textcode[1]{\texttt{#1}}