diff --git a/build/lib/iexcode/instruments/scanRecord.py b/build/lib/iexcode/instruments/scanRecord.py
index b836c161d9f8a523c882ce0f6bf2afc6cefae57b..bbf6676d39d9a8d0ec7b0e477cdb3e996719a521 100644
--- a/build/lib/iexcode/instruments/scanRecord.py
+++ b/build/lib/iexcode/instruments/scanRecord.py
@@ -411,7 +411,7 @@ class ScanRecord:
         kwargs.setdefault('scan_dim',1)
 
         scan_pv = self.ioc+"scan"+str(kwargs['scan_dim'])
-        caput(scan_pv+".CMND",3)        # Clear all Positionners
+        caput(scan_pv+".CMND",4)        # Clear all Positioners,etc
         
         if verbose:
             print("\nAll extra positionners cleared")    
@@ -479,9 +479,6 @@ class ScanRecord:
         kwargs.setdefault('positioner_settling_time',default_positioner_settling_time)
         kwargs.setdefault('debug',False)
 
-        if 'trigger_dictionary' in kwargs:
-            self.trigger_dictionary = kwargs['trigger_dictionary']
-
         self.progress(kwargs['scan_dim'])
     
         scan_pv = self.ioc+"scan"+str(kwargs['scan_dim'])
@@ -505,6 +502,8 @@ class ScanRecord:
         self.detector_settling_time(**kwargs)
         self.positioner_settling_time(**kwargs)
         
+        if 'trigger_dictionary' in kwargs:
+            self.trigger_dictionary = kwargs['trigger_dictionary']
         self.triggers_set(kwargs['scan_dim'],self.trigger_dictionary)
 
         #checking that PVs and positioner limits are good
diff --git a/iexcode/instruments/scanRecord.py b/iexcode/instruments/scanRecord.py
index 9196ee2d4f0b46d32ef22ee5df0098635837fddb..bbf6676d39d9a8d0ec7b0e477cdb3e996719a521 100644
--- a/iexcode/instruments/scanRecord.py
+++ b/iexcode/instruments/scanRecord.py
@@ -411,7 +411,7 @@ class ScanRecord:
         kwargs.setdefault('scan_dim',1)
 
         scan_pv = self.ioc+"scan"+str(kwargs['scan_dim'])
-        #caput(scan_pv+".CMND",3)        # Clear all Positionners
+        caput(scan_pv+".CMND",4)        # Clear all Positioners,etc
         
         if verbose:
             print("\nAll extra positionners cleared")    
@@ -479,9 +479,6 @@ class ScanRecord:
         kwargs.setdefault('positioner_settling_time',default_positioner_settling_time)
         kwargs.setdefault('debug',False)
 
-        if 'trigger_dictionary' in kwargs:
-            self.trigger_dictionary = kwargs['trigger_dictionary']
-
         self.progress(kwargs['scan_dim'])
     
         scan_pv = self.ioc+"scan"+str(kwargs['scan_dim'])
@@ -505,6 +502,8 @@ class ScanRecord:
         self.detector_settling_time(**kwargs)
         self.positioner_settling_time(**kwargs)
         
+        if 'trigger_dictionary' in kwargs:
+            self.trigger_dictionary = kwargs['trigger_dictionary']
         self.triggers_set(kwargs['scan_dim'],self.trigger_dictionary)
 
         #checking that PVs and positioner limits are good