diff --git a/py4syn/epics/AreaDetector.py b/py4syn/epics/AreaDetector.py
index 19578c2..e344ff2 100755
--- a/py4syn/epics/AreaDetector.py
+++ b/py4syn/epics/AreaDetector.py
@@ -68,7 +68,7 @@ def __init__(self, mnemonic, pv,device, fileplugin,
             self.detector.add_callback("Acquire_RBV",
                                    callback=self.onAcquireChange)
             self.setImageMode(0)
-
+            self.detector.TriggerMode = 1
         self.detector.Scan = 9
         self.detector.ImageMode = self.getImageMode()
         self.detector.AcquirePeriod = 0
@@ -101,7 +101,7 @@ def __init__(self, mnemonic, pv,device, fileplugin,
             self.stopCapture()
     
         if self.trigger == 'External':
-            self.setTriggerMode(3)
+            self.setTriggerMode(4)
         else:
             self.setTriggerMode(1)
         self.detector.ImageMode = self.getImageMode()
@@ -378,6 +378,7 @@ def setCountTime(self, t):
             Acquisition time
         """
         self.detector.AcquireTime = t
+        
         self.detector.AcquirePeriod = 0
 
     def getAcquireTime(self):
@@ -397,6 +398,7 @@ def startCount(self):
         """
         if not self._done:
             raise RuntimeError('Already counting')
+        self.detector.AcquirePeriod = 0
         self.detector.Acquire = 1
         self._done = 0 # force the confirmation that the detector has already received acquire function
         
diff --git a/py4syn/utils/scan.py b/py4syn/utils/scan.py
index 42a71fb..a42774d 100755
--- a/py4syn/utils/scan.py
+++ b/py4syn/utils/scan.py
@@ -1206,7 +1206,8 @@ def __terminate(self):
         x = SCAN_DATA[XFIELD]
         y = SCAN_DATA[YFIELD]
         if(FIT_SCAN):
-            fitData(x, y)
+            if type(y[0]) is not numpy.ndarray:
+                fitData(x, y)
             if(PRINT_SCAN):
                 print("Peak = ", PEAK, " at ", PEAK_AT)
                 print("Fwhm = ", FWHM, " at ", FWHM_AT)
@@ -1484,7 +1485,7 @@ def doTime(self):
 
     def doFly(self):
         global FIT_SCAN
-
+        FIT_SCAN = False
         positions = []
         indexes = []