diff --git a/tracy/tools/soltracy.cc b/tracy/tools/soltracy.cc
index b6e6053f350e3ddce534fc8a2311bb0ea2341be4..3e97134287d5582761345c8d728d5770d69bfcd8 100644
--- a/tracy/tools/soltracy.cc
+++ b/tracy/tools/soltracy.cc
@@ -129,10 +129,10 @@ int main(int argc, char *argv[]) {
   //set RF voltage  
   else if(strcmp(CommandStr,"RFvoltageFlag") == 0) {
     printf("\nSetting RF voltage:\n");
-    printf("    Old RF voltage is: %lf [MV]\n", get_RFVoltage(ElemIndex("cav"))
+    printf("    Old RF voltage is: %lf [MV]\n", get_RFVoltage(globval.cav)
         / 1e6);
-    set_RFVoltage(ElemIndex("cav"), UserCommandFlag[i].RFvolt);
-    printf("    New RF voltage is: %lf [MV]\n", get_RFVoltage(ElemIndex("cav"))
+    set_RFVoltage(globval.cav, UserCommandFlag[i].RFvolt);
+    printf("    New RF voltage is: %lf [MV]\n", get_RFVoltage(globval.cav)
         / 1e6);
   }
 
@@ -625,7 +625,7 @@ int main(int argc, char *argv[]) {
     double sum_delta[globval.Cell_nLoc + 1][2];
     double sum2_delta[globval.Cell_nLoc + 1][2];
 
-    GetEmittance(ElemIndex("cav"), true);
+    GetEmittance(globval.cav, true);
 
     // initialize momentum aperture arrays
     for (k = 0; k <= globval.Cell_nLoc; k++) {