1 files changed, 8 insertions, 5 deletions
diff --git a/tex/context/base/x-mathml.mkiv b/tex/context/base/x-mathml.mkiv
index daeae97b6..d0c1aaa8a 100644
--- a/tex/context/base/x-mathml.mkiv
+++ b/tex/context/base/x-mathml.mkiv
@@ -2361,10 +2361,12 @@
     \edef\mmlovercommand {\utfmathcommandabove\mmlovertoken}
     \edef\mmlbasecommand {\mmlovercommand\mmlundercommand}
     \ifcsname\mmlbasecommand\endcsname
-        \csname\mmlbasecommand\endcsname {\mmlfencedfirst{#1}}
+       %\csname\mmlbasecommand\endcsname{\mmlfencedfirst{#1}}
+        \lastnamedcs {\mmlfencedfirst{#1}}
     \else\ifcsname\mmlundercommand\endcsname
         \ifcsname\mmlovercommand\endcsname
-            \csname\mmlovercommand\endcsname {\csname\mmlundercommand\endcsname{\mmlfencedfirst{#1}}}
+           %\csname\mmlovercommand\endcsname{\csname\mmlundercommand\endcsname{\mmlfencedfirst{#1}}}
+            \lastnamedcs {\csname\mmlundercommand\endcsname{\mmlfencedfirst{#1}}}
         \else
             \mmldoubletriplet {\csname\mmlundercommand\endcsname{\mmlfencedfirst{#1}}} {\mmlfencedthird{#1}\mmlfencedthird{#1}} {}
         \fi
@@ -2378,7 +2380,8 @@
     \edef\mmlundercommand{\utfmathcommandbelow\mmlundertoken}
     \edef\mmlbasecommand {\mmlundercommand text}
     \ifcsname\mmlbasecommand\endcsname
-        \csname\mmlbasecommand\endcsname {\mmlfencedfirst{#1}} {\mmlfencedthird{#1}}
+       %\csname\mmlbasecommand\endcsname {\mmlfencedfirst{#1}} {\mmlfencedthird{#1}}
+        \lastnamedcs {\mmlfencedfirst{#1}} {\mmlfencedthird{#1}}
     \else\ifcsname\mmlundercommand\endcsname
         \mmldoubletriplet {\csname\mmlundercommand\endcsname{\mmlfencedfirst{#1}}} {\mmlfencedthird{#1}} {}
     \else
@@ -2389,7 +2392,8 @@
     \edef\mmlovercommand{\utfmathcommandabove\mmlovertoken}
     \edef\mmlbasecommand{\mmlovercommand text}
     \ifcsname\mmlbasecommand\endcsname
-        \csname\mmlbasecommand\endcsname {\mmlfencedfirst{#1}} {\mmlfencedsecond{#1}}
+       %\csname\mmlbasecommand\endcsname {\mmlfencedfirst{#1}} {\mmlfencedsecond{#1}}
+        \lastnamedcs {\mmlfencedfirst{#1}} {\mmlfencedsecond{#1}}
     \else\ifcsname\mmlovercommand\endcsname
         \mmldoubletriplet {\csname\mmlovercommand\endcsname{\mmlfencedfirst{#1}}} {} {\mmlfencedsecond{#1}}
     \else
@@ -2412,7 +2416,6 @@
     \edef\mmlbasecommand{e\utfmathcommandfiller\mmlbasetoken}%
     \mmlexecuteifdefined\mmlbasecommand \relax {\mmlfencedthird{#1}} {\mmlfencedsecond{#1}}
 \stoptexdefinition
-
 \startxmlsetups mml:munderover
     \edef\mmlbasetoken{\mmlextensible{\xmlraw{#1}{/mml:*[1]}}}% /text()
     \doifelseutfmathfiller\mmlbasetoken \mmlunderoverbasefiller \mmlunderoveraccentchecker {#1}