diff --git a/luamml-patches-amsmath.sty b/luamml-patches-amsmath.sty
index 04c97f5..9a8ccee 100644
--- a/luamml-patches-amsmath.sty
+++ b/luamml-patches-amsmath.sty
@@ -38,7 +38,7 @@
           \m@th
           \displaystyle
           {##}
-          \luamml_save:nNn {} \displaystyle {mtd}
+          \UseTaggingSocket{math/luamml/save/nNn}{ {} \displaystyle {mtd}}
         $
         \UseTaggingSocket{math/luamml/mtable/finalizecol}
         \tabskip \z@skip
@@ -50,7 +50,7 @@
             {}
             ##
           }
-          \luamml_save:nNn {} \displaystyle {mtd}
+          \UseTaggingSocket{math/luamml/save/nNn}{ {} \displaystyle {mtd}}
         $
         \UseTaggingSocket{math/luamml/mtable/finalizecol}
         \hfil
@@ -77,7 +77,7 @@
           \m@th
           \displaystyle
           ##
-          \luamml_save:nNn {} \displaystyle {mtd}
+          \UseTaggingSocket{math/luamml/save/nNn}{ {} \displaystyle {mtd}}
         $
         \UseTaggingSocket{math/luamml/mtable/finalizecol}
         \hfil
@@ -114,7 +114,7 @@
           \m@th
           \displaystyle
           {##}
-          \luamml_save:nNn {} \displaystyle {mtd}
+          \UseTaggingSocket{math/luamml/save/nNn}{ {} \displaystyle {mtd}}
         $
       }
       \__luamml_amsmath_add_box_to_row:
@@ -174,7 +174,7 @@
         \ifmeasuring@
           \luamml_ignore:
         \else
-          \luamml_save:nNn {} \displaystyle {mtd}
+          \UseTaggingSocket{math/luamml/save/nNn}{ {} \displaystyle {mtd}}
         \fi
       $
     }
@@ -198,7 +198,7 @@
       \ifmeasuring@
         \luamml_ignore:
       \else
-        \luamml_save:nNn {} \displaystyle {mtd}
+        \UseTaggingSocket{math/luamml/save/nNn}{ {} \displaystyle {mtd}}
       \fi
       $
     }
@@ -360,7 +360,8 @@
         \m@th
         \scriptstyle
         ##
-        \luamml_save:nn {} {mtd} % No \scriptsize here since we want to add the mstyle nodes
+        % No \scriptsize here since we want to add the mstyle nodes
+        \UseTaggingSocket{math/luamml/save/nn}{ {} {mtd}}
         $
         \UseTaggingSocket{math/luamml/mtable/finalizecol}
         \hfil
@@ -371,7 +372,8 @@
         \m@th
         \scriptstyle
         ##
-        \luamml_save:nn {} {mtd} % No \scriptsize here since we want to add the mstyle nodes
+        % No \scriptsize here since we want to add the mstyle nodes
+        \UseTaggingSocket{math/luamml/save/nn}{ {} {mtd}}        
         $
         \UseTaggingSocket{math/luamml/mtable/finalizecol}
         \hfil