Index: trunk/MagicSoft/Mars/mdata/MDataPhrase.cc
===================================================================
--- trunk/MagicSoft/Mars/mdata/MDataPhrase.cc	(revision 8716)
+++ trunk/MagicSoft/Mars/mdata/MDataPhrase.cc	(revision 8717)
@@ -143,6 +143,8 @@
     while (1)
     {
+        // \\A: matches the beginning of the string like ^ does
+        // \\Z: matches the end       of the string like $ does
         // \\W: matches any non-word character [^a-zA-Z_0-9]
-        TPRegexp reg(Form("\\W\\[0*%d\\]\\W", idx));
+        TPRegexp reg(Form("(\\A|\\W)\\[0*%d\\](\\W|\\Z)", idx));
         if (reg.Match(phrase, mods, 0, 130, &pos)==0)
             break;
@@ -268,4 +270,5 @@
 
         // Also hex-numbers and floats fullfill our condition...
+        // FIXME: WHY HEX NUMBERS?
         if (!expr(ishex).IsNull() || expr.IsFloat())
         {