--- a/tex/texmf-context/tex/context/base/strc-ref.mkiv	2010-05-21 15:44:04.000000000 +0400
+++ b/tex/texmf-context/tex/context/base/strc-ref.mkiv	2010-05-31 22:18:38.000000000 +0400
@@ -983,10 +983,13 @@
   {\ifx\next\bgroup
      \afterassignment\doinatreferenceonetwo
      \expandafter\leftreferencetoks
-   \else
+   \else\ifx\textofreference\empty
      \leftreferencetoks\emptytoks
      \expandafter\dodoinatreferencenone
-   \fi}
+   \else
+     \leftreferencetoks{\textofreference}%
+     \expandafter\doinatreferenceonetwo
+   \fi\fi}
 
 \def\doinatreferenceonetwo
   {\futurelet\next\doinatreferencetwo}
@@ -1022,7 +1025,11 @@
    \doifreferencefoundelse{#4}
      {\doifelsenothing{#1}\dosymbolreference\dowantedreference{#1}{#2}[#4]}%
      {\dounknownreference{#1}{#2}[#4]}%
-   \endgroup}
+   \endgroup%
+   \global\let\leftofreference\relax
+   \global\let\rightofreference\relax
+   \global\let\textofreference\empty
+   }
 
 \let\dosymbolreference\dowantedreference