diff --git a/jjb/pipeline/voltha/bbsim-tests.groovy b/jjb/pipeline/voltha/bbsim-tests.groovy
index c0682fb..bb16bc5 100644
--- a/jjb/pipeline/voltha/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/bbsim-tests.groovy
@@ -374,11 +374,9 @@
       if [ ${withMonitoring} = true ] ; then
         JENKINS_NODE_COOKIE="dontKillMe" _TAG="nem-monitoring-prometheus-server" bash -c "while true; do kubectl port-forward --address 0.0.0.0 -n default svc/nem-monitoring-prometheus-server 31301:80; done"&
       fi
-      if (vgcEnabled) {
+      if [ ${vgcEnabled} = true ] ; then
         JENKINS_NODE_COOKIE="dontKillMe" _TAG="vgc-Port-Forward-Enable" bash -c "while true; do kubectl port-forward --address 0.0.0.0 -n voltha svc/voltha-voltha-go-controller 8181:8181; done"&
       fi
-    }
-
 #      ps aux | grep port-forward
 """)
             // ---------------------------------
diff --git a/vars/volthaStackDeploy.groovy b/vars/volthaStackDeploy.groovy
index 77f0fe5..569c2f4 100644
--- a/vars/volthaStackDeploy.groovy
+++ b/vars/volthaStackDeploy.groovy
@@ -62,7 +62,7 @@
           --set voltha.ingress.hosts[0].host=voltha.${cfg.cluster} \
           --set voltha.ingress.hosts[0].paths[0]='/voltha.VolthaService/' \
           --set global.voltha_infra_namespace=${cfg.infraNamespace} \
-          --set voltha.replicas.ofagent=0
+          --set voltha.replicas.ofagent=0 \
           ${cfg.extraHelmFlags}
 """)
     } else {