diff --git a/script/HystScan.py b/script/HystScan.py
index 8403476..67524fe 100644
--- a/script/HystScan.py
+++ b/script/HystScan.py
@@ -67,13 +67,16 @@ wait_device(pol_done, "DONE")
 
 #open(2.0)
 
+print "Set energy"
+setpoint2 = ENERGIES(0)
+print setpoint2
+energy.write(setpoint2)
+sleep( ENERGY_CHANGE_SLEEP ) # Settling time     
+    
 print "Set end field"
 field.write(END_FIELD)  #caputq('X07MA-PC-PS2:M:GO.A', END_FIELD)
 
 
-if len (ENERGIES)==1:
-        energy.write(setpoint2)
-        sleep( ENERGY_CHANGE_SLEEP ) # Settling time
 
 index = 0
 while(True):