diff --git a/texmf/tex/latex/mathscript/mathscript.cls b/texmf/tex/latex/mathscript/mathscript.cls
index e039a84..f7497ea 100644
--- a/texmf/tex/latex/mathscript/mathscript.cls
+++ b/texmf/tex/latex/mathscript/mathscript.cls
@@ -514,21 +514,26 @@
 
 %\makeatletter
 %declare new term to the index, output if no star is given to call position
+%\NewDocumentCommand{\begriff}{s O{} m O{}}{%
+%	\index{#2#3#4}%
+%	\IfBooleanTF{#1}\relax\uline{#3\/}%
+%	\futurelet\begriffnextchar\begriffspace%
+%}
+%\def\begriffspace{%
+%	\if\begriffnextchar.\else%
+%		\if\begriffnextchar,\else%
+%			\if\begriffnextchar;\else%
+%				\ %
+%			\fi%
+%		\fi%
+%	\fi%
+%}
+%\makeatother
+
 \NewDocumentCommand{\begriff}{s O{} m O{}}{%
 	\index{#2#3#4}%
-	\IfBooleanTF{#1}\relax\uline{#3\/}%
-	\futurelet\begriffnextchar\begriffspace%
+	\IfBooleanTF{#1}{}{\uline{#3}\ }%
 }
-\def\begriffspace{%
-	\if\begriffnextchar.\else%
-		\if\begriffnextchar,\else%
-			\if\begriffnextchar;\else%
-				\ %
-			\fi%
-		\fi%
-	\fi%
-}
-%\makeatother
 
 %append a new mathsymbol to the index, output if no star is given at the call position
 \NewDocumentCommand{\mathsymbol}{s O{} m m O{}}{%