diff --git a/src/EEHGMaster.py b/src/EEHGMaster.py
index 7ed6c6297a98d82a57debc18c4c28534932e1f39..e234f70260ce20f4484ec2c1e0379c8f47d37edb 100755
--- a/src/EEHGMaster.py
+++ b/src/EEHGMaster.py
@@ -703,7 +703,7 @@ class EEHGMaster(Device):
         self._lambda_s1or2_fix = True
         self._fl_s1 = True
         self._waist_corr_s1 = float('Nan')
-        self._nrg_s1_fix = False
+        self._nrg_s1_fix = True
         self._dt_s1 = 200e-15 #seed pulse
         self._nrg_s1 = float('Nan')
         self._nrg_s1_curr = 5.0
@@ -1082,8 +1082,9 @@ class EEHGMaster(Device):
         """Set the a1_fix attribute."""
         self._a1_fix = value
         self.a1_fix.set_write_value = value
+        self._nrg_s1_fix = value 
         self._a2_fix = not value
-        pass
+        self._nrg_s2_fix = not value
         # PROTECTED REGION END #    //  EEHGMaster.a1_fix_write
 
     def read_a2(self):
@@ -1146,7 +1147,10 @@ class EEHGMaster(Device):
         """Set the a2_fix attribute."""
         self._a2_fix = value
         self.a2_fix.set_write_value = value
+        self._nrg_s2_fix = value
         self._a1_fix = not value
+        self._nrg_s1_fix = not value
+
         # PROTECTED REGION END #    //  EEHGMaster.a2_fix_write
 
     def read_e_nrg_fel(self):
@@ -1244,7 +1248,6 @@ class EEHGMaster(Device):
         # PROTECTED REGION ID(EEHGMaster.r561_fix_write) ENABLED START #
         """Set the r561_fix attribute."""
         self._r561_fix = value
-        self._r561_fix.set_write_value = value
         self._r562_fix = not value
         # PROTECTED REGION END #    //  EEHGMaster.r561_fix_write
 
@@ -1314,7 +1317,6 @@ class EEHGMaster(Device):
         # PROTECTED REGION ID(EEHGMaster.r562_fix_write) ENABLED START #
         """Set the r562_fix attribute."""
         self._r562_fix = value
-        self._r562_fix.set_write_value = value
         self._r561_fix = not value
         # PROTECTED REGION END #    //  EEHGMaster.r562_fix_write
 
@@ -1465,7 +1467,12 @@ class EEHGMaster(Device):
     def write_nrg_s1_fix(self, value):
         # PROTECTED REGION ID(EEHGMaster.nrg_s1_fix_write) ENABLED START #
         """Set the nrg_s1_fix attribute."""
-        pass
+        self._nrg_s1_fix = value
+#        self.write_a1_fix(value)
+        self._a1_fix = value
+        self._nrg_s1_fix = value 
+        self._a2_fix = not value
+        self._nrg_s2_fix = not value
         # PROTECTED REGION END #    //  EEHGMaster.nrg_s1_fix_write
 
     def read_pow_s1(self):
@@ -1586,7 +1593,10 @@ class EEHGMaster(Device):
     def write_nrg_s2_fix(self, value):
         # PROTECTED REGION ID(EEHGMaster.nrg_s2_fix_write) ENABLED START #
         """Set the nrg_s2_fix attribute."""
-        pass
+        self._a1_fix = not value
+        self._nrg_s1_fix = not value 
+        self._a2_fix = value
+        self._nrg_s2_fix = value
         # PROTECTED REGION END #    //  EEHGMaster.nrg_s2_fix_write
 
     def read_pow_s2(self):