diff --git a/script/Alignment/Gun_solenoid_alignment.py b/script/Alignment/Gun_solenoid_alignment.py
index 26c4bb6..7b8c137 100755
--- a/script/Alignment/Gun_solenoid_alignment.py
+++ b/script/Alignment/Gun_solenoid_alignment.py
@@ -29,6 +29,7 @@ if get_exec_pars().source == CommandSource.ui:
 else:
     centroid_excursion_plot = False
 
+kill_camtool()
 check_camtool()
 
 laser_was_on = is_laser_on()
@@ -90,8 +91,7 @@ try:
     r = lscan(gun_solenoid, sensors , I1, I2, dI, settling_time, before_read = before_sample, after_read = after_sample)
 finally:
     if mode == "camtool": camtool.stop()
-
-gun_solenoid.write(original_gun_solenoid)
+    gun_solenoid.write(original_gun_solenoid)
 if laser_was_on:
     laser_on()
 else:
diff --git a/script/local.py b/script/local.py
index cf6b8ca..7582319 100755
--- a/script/local.py
+++ b/script/local.py
@@ -343,8 +343,8 @@ def kill_camtool():
  
 def _run_camtool():
     try:
-        cmd = "source /opt/gfa/python ;"        
-        cmd += CAMTOOL_SERVER_SCRIPT + " -p " + _get_camtool_port() + " -b /afs/psi.ch/intranet/SF/Applications/config/camtool_n"
+        #cmd = "source /opt/gfa/python\n"        
+        cmd = CAMTOOL_SERVER_SCRIPT + " -p " + _get_camtool_port() + " -b /afs/psi.ch/intranet/SF/Applications/config/camtool_n"
         if not PRINT_CAMTOOL_OUTPUT:
             cmd = cmd + " > /dev/null 2>&1"
         print "Executing: ", cmd