diff --git a/plugins/EnergyScan.java b/plugins/EnergyScan.java
index d8a0b9a..fc3a8f9 100644
--- a/plugins/EnergyScan.java
+++ b/plugins/EnergyScan.java
@@ -108,7 +108,7 @@ public class EnergyScan extends Panel {
         args.put("PLOT_TYPE", radioK1.isSelected() ? 1 : 2);
         args.put("SET_OFFSETS", jCheckBox1.isSelected() ? 1 : 2);
         args.put("ID1", jRadioButton1.isSelected() ? 1 : 2);
-        args.put("ID2", jRadioButton1.isSelected() ? 1 : 2);
+        args.put("ID2", jRadioButton2.isSelected() ? 1 : 2);
 
         buttonAbort.setEnabled(true);
 
diff --git a/script/EnergyScan.py b/script/EnergyScan.py
index 2a59552..e6d1ac5 100644
--- a/script/EnergyScan.py
+++ b/script/EnergyScan.py
@@ -1,7 +1,7 @@
 import os
 import traceback
 ############################PGM+ID1+ID2###################################################
-'''if str(SET_OFFSETS) == "1":
+if str(SET_OFFSETS) == "1":
     print "Setting offsets"
     if RUNTYPE in ["+/-", "+" , "-"]:  
         caput(OTF_MODE1,1) # circ + in ID1 
@@ -120,7 +120,12 @@ fid = get_next_fid(input_path, "o" + file_prefix)
 ###############################################################################
 #Prepare scan
 ###############################################################################
-caput ("X11PHS-E:OPT","PGM+ID1+ID2")
+if ID1 == 1:
+    caput ("X11PHS-E:OPT","PGM+ID1")
+elif ID2 == 1:
+    caput ("X11PHS-E:OPT","PGM+ID2")
+else:
+    caput ("X11PHS-E:OPT","PGM+ID1+ID2")
 
 number_of_scans = 1
 if RUNTYPE in ["+/-", "+", "-"]:
@@ -219,5 +224,4 @@ close_vg13()
 
 print "Finished Energy scan"
 
-print("Success")        '''
-print ID1,ID2
+print("Success")