diff --git a/script/Marco/power-supply.py b/script/Marco/power-supply.py
index 8874729..0e03c08 100644
--- a/script/Marco/power-supply.py
+++ b/script/Marco/power-supply.py
@@ -34,7 +34,7 @@ for setpoint1 in frange(0.0, 50.0, 4.0, True):
     readback1 = SetVA.get()
     if abs(readback1 - setpoint1) > 0.5 : # TODO: Check accuracy
         raise Exception('Actor SetVA could not be set to the value ' + str(setpoint1))
-    for setpoint2 in frange(0.0, 5.0, 1.0, True):
+    for setpoint2 in frange(0.0, 20.0, 1.0, True):
         #Detector time
         detector1 = float(java.lang.System.currentTimeMillis())
         #Detector ActualVA
@@ -42,6 +42,8 @@ for setpoint1 in frange(0.0, 50.0, 4.0, True):
         #scan.append ([setpoint1], [readback1], [detector1, detector2])
         scan.append ([detector1], [detector1], [readback1, detector2])
         sleep( 0.1 ) # Settling time
+        if detector2 >= setpoint1:
+            break
 
 #Closing channels
 SetVA.close()