diff --git a/tracy/tracy/src/t2lat.cc b/tracy/tracy/src/t2lat.cc
index 57213c49062be8df6e068459a782da39acfc8b63..44dc78de77acb881112b4953150e86a9c4c35d26 100644
--- a/tracy/tracy/src/t2lat.cc
+++ b/tracy/tracy/src/t2lat.cc
@@ -7,9 +7,9 @@ L. Nadolski   SOLEIL        2002          Link to NAFF, Radia field maps
 J. Bengtsson  NSLS-II, BNL  2004 -        
 
 */
-/* Current revision $Revision: 1.18 $
+/* Current revision $Revision: 1.19 $
  On branch $Name: not supported by cvs2svn $
- Latest change $Date: 2011-05-09 16:38:37 $ by $Author: zhang $
+ Latest change $Date: 2011-06-30 16:41:49 $ by $Author: zhang $
 */
 
 
@@ -4323,22 +4323,25 @@ void PrintResult(struct LOC_Lattice_Read *LINK)
        none
 
    Comments:
-       
+       30-06-2011   Fix the bug to get the correct Cell[i].Elem.PName. 
 ****************************************************************************/
 
 long ElemIndex(const char *name)
 {
-  long       i;
-  int        n;
+  long       i = 0;
+  int        n = 0;
   partsName  name1, name2;
 
   const bool  prt = false;
 
   if (prt) printf("\n");
 
-  strcpy(name1, name);
-  for (i = 0; i < (signed)strlen(name); i++)
-    name1[i] = tolower(name[i]);
+while(name[i]!= ' ' && name[i]!= '\0'){
+  name1[i] = tolower(name[i]);
+  i++;
+  }
+name1[i] = '\0'; 
+
 
   if (globval.Elem_nFam > Elem_nFamMax) {
     printf("ElemIndex: Elem_nFamMax exceeded: %ld(%d)\n",