diff --git a/beamerouterthememetropolis.dtx b/beamerouterthememetropolis.dtx
index a0a38d1..e18fefd 100644
--- a/beamerouterthememetropolis.dtx
+++ b/beamerouterthememetropolis.dtx
@@ -77,15 +77,21 @@
     .is choice,
     regular/.code={%
        \renewcommand{\@metropolis@frametitleformat}{}%
-       \setlength{\@metropolis@frametitlestrut}{\heightof{ABCDEFGHIJKLMNOPQRSTUVXYZ}}% Usually around 1.6ex but is font dependant
+       \renewcommand{\@metropolis@frametitlestrut}{%
+           \rule{0pt}{\heightof{ABCDEFGHIJKLMNOPQRSTUVWXYZ}}
+       }
        },
     lowercase/.code={%
        \renewcommand{\@metropolis@frametitleformat}{\MakeLowercase}%
-       \setlength{\@metropolis@frametitlestrut}{\heightof{abcdefghijklmnopqrstuvxyz}}
+       \renewcommand{\@metropolis@frametitlestrut}{%
+           \rule{0pt}{\heightof{abcdefghijklmnopqrstuvwxyz}}
+       }
        },
     uppercase/.code={%
-       \renewcommand{\@metropolis@frametitleformat}{\MakeUppercase}%
-       \setlength{\@metropolis@frametitlestrut}{\heightof{ABCDEFGHIJKLMNOPQRSTUVXYZ}}% Usually around 1.6ex but is font dependant
+       \renewcommand{\@metropolis@frametitleformat}{\myletterspacing\MakeUppercase}%
+       \renewcommand{\@metropolis@frametitlestrut}{%
+           \rule{0pt}{\heightof{ABCDEFGHIJKLMNOPQRSTUVWXYZ}}
+       }
        },
 }
 %    \end{macrocode}
@@ -211,7 +217,7 @@
       wd=\paperwidth,
       sep=1.5ex,
     ]{frametitle}
-  \insertframetitle\rule{0pt}{\@metropolis@frametitlestrut}%
+  \insertframetitle\@metropolis@frametitlestrut%
   \end{beamercolorbox}%
   \vspace{\@metropolis@voffset}
 }
@@ -221,7 +227,7 @@
       wd=\paperwidth,
       sep=1.5ex,
     ]{frametitle}
-  \insertframetitle\rule{0pt}{\@metropolis@frametitlestrut}%
+  \insertframetitle\@metropolis@frametitlestrut%
   \end{beamercolorbox}%
   \usebeamertemplate*{progress bar in head/foot}
   \vspace{\@metropolis@voffset}