diff --git a/script/HystScan.py b/script/HystScan.py
index 1ef296b..3545a3e 100644
--- a/script/HystScan.py
+++ b/script/HystScan.py
@@ -96,9 +96,12 @@ while(True):
                 dif_series.appendData(field_readback,dif)
         scan.append ([field_readback, setpoint2], [field_readback, readback2], [detector1, detector2, detector3, detector4, detector5, detector6, detector7, detector8, tey_norm, trans_norm])
 
-    if field_done.read() == 1:   #If not ramping #ramp_done.get() == 1:  
-        print "Not ramping, breaking execution"
+    #if field_done.read() == 1:   #If not ramping #ramp_done.get() == 1:  
+    if abs(field_readback - END_FIELD) < 0.007:  
+        print "Field has reached target, breaking execution."
         break
     index = index+1
 
 scan.end()
+
+ramp_rate.write(2.0)
diff --git a/script/local.py b/script/local.py
index 2943736..ed981b0 100644
--- a/script/local.py
+++ b/script/local.py
@@ -222,7 +222,7 @@ def close_valve(delay = 0.0):    #TODO: Check default delay
     """
     """
     valve_try_open.write(0)
-    time.sleep(fset_pol_cplusloat(delay))
+    time.sleep(float(delay))
 
 def set_energy (value, delay=0.5):
     """