diff --git a/TestON/JenkinsFile/FabricJenkinsfileTrigger b/TestON/JenkinsFile/FabricJenkinsfileTrigger
index d1efa2c..21f5ec4 100644
--- a/TestON/JenkinsFile/FabricJenkinsfileTrigger
+++ b/TestON/JenkinsFile/FabricJenkinsfileTrigger
@@ -175,19 +175,19 @@
 /*
 if ( !manually_run ){
     funcs.generateStatGraph( "TestStation-Fabric4s",
-                             funcs.branchWithPrefix( "current_version" ),
+                             funcs.branchWithPrefix( current_version ),
                              AllTheTests,
                              stat_graph_generator_file,
                              pie_graph_generator_file,
                              graph_saved_directory )
     funcs.generateStatGraph( "TestStation-Fabric2s",
-                             funcs.branchWithPrefix( "previous_version" ),
+                             funcs.branchWithPrefix( previous_version ),
                              AllTheTests,
                              stat_graph_generator_file,
                              pie_graph_generator_file,
                              graph_saved_directory )
     funcs.generateStatGraph( "TestStation-Fabric3s",
-                             funcs.branchWithPrefix( "before_previous_version" ),
+                             funcs.branchWithPrefix( before_previous_version ),
                              AllTheTests,
                              stat_graph_generator_file,
                              pie_graph_generator_file,
diff --git a/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy b/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
index bbf12a4..b7c9c2e 100644
--- a/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
+++ b/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
@@ -86,11 +86,12 @@
 def fabricOn( branch ){
   // gets the fabric machines with the branch of onos.
   // branch : master, 1.12, 1.13...
-
+  // branch.reverse().take(4).reverse() will get last 4 characters of the string.
   switch( branch.reverse().take(4).reverse() ) {
-    case "master": return "4"
+    case "ster": return "4"
     case "1.13": return "2"
     case "1.12": return "3"
+    default: return "4"
   }
 }
 def printType(){