diff --git a/script/local.py b/script/local.py
index cdddc23..9eddaaa 100644
--- a/script/local.py
+++ b/script/local.py
@@ -198,13 +198,13 @@ def close_valve(delay = 0.0):    #TODO: Check default delay
 
 def set_energy (value, delay=0.5):
     energy.write(float(value))
-    energy_done.waitValue(1000)
+    energy_done.waitValue(1, 5000)
     time.sleep(float(delay))
 
 def set_cff (value):
     cff.write(float(value))
     caput("X07MA-PGM:setE.PROC",1)
-    energy_done.waitValue(1000)
+    energy_done.waitValue(1, 1000)
 
 def set_slit(value):
     exit_slit.write(float(value))