diff --git a/Text/TeXMath/Parser.hs b/Text/TeXMath/Parser.hs
index dd3772e2..618438a9 100644
--- a/Text/TeXMath/Parser.hs
+++ b/Text/TeXMath/Parser.hs
@@ -97,7 +97,7 @@ inbraces :: TP Exp
inbraces = liftM EGrouped (braces $ many $ notFollowedBy (char '}') >> expr)
texToken :: TP Exp
-texToken = inbraces <|> inbrackets <|>
+texToken = texSymbol <|> inbraces <|> inbrackets <|>
do c <- anyChar
spaces
return $ if isDigit c
diff --git a/tests/tokens.omml b/tests/tokens.omml
new file mode 100644
index 00000000..2e4fe831
--- /dev/null
+++ b/tests/tokens.omml
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ϕ
+
+
+
+
+
+
+
+
+
+
+
+ ϕ
+
+
+
+
+
+
+
+
+
+
+ ϕ
+
+
+
+
+
+ ξ
+
+
+
+
+
+
+
+
+
+
+ ϕ
+
+
+
+
+
+ ξ
+
+
+
+
+
+
+
+
+
+
+ ϕ
+
+
+
+
+
+ ξ
+
+
+
+
+
+ (
+
+
+
+ ϕ
+
+
+
+ )
+
+
+
+ (
+
+
+
+ ϕ
+
+
+
+ )
+
+
+
+ ξ
+
+
+
diff --git a/tests/tokens.tex b/tests/tokens.tex
new file mode 100644
index 00000000..d77a843e
--- /dev/null
+++ b/tests/tokens.tex
@@ -0,0 +1,17 @@
+\newcommand{\my}[1]{(#1)}
+
+
+% diacritics
+\tilde\phi
+
+% unary operators
+\sqrt\phi
+
+% binary operators
+\frac\phi\xi
+\frac \phi {\xi}
+\frac {\phi} \xi
+
+% custom
+\my\phi
+\my{\phi}\xi
diff --git a/tests/tokens.xhtml b/tests/tokens.xhtml
new file mode 100644
index 00000000..d99c0435
--- /dev/null
+++ b/tests/tokens.xhtml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+