diff --git a/Source/Python/Classes/EcFlexpart.py b/Source/Python/Classes/EcFlexpart.py
index 4584af6ffadd352e9695456a9f7c878f587bc51f..a7dda984e8bf8e0babc74b967ca68128d9e288e3 100644
--- a/Source/Python/Classes/EcFlexpart.py
+++ b/Source/Python/Classes/EcFlexpart.py
@@ -785,8 +785,6 @@ class EcFlexpart(object):
                             self._start_retrievement(request, retr_param_dict)
 
                     elif self.basetime == 0:
-#                        retr_param_dict['date'] = \
-#                            datetime.strftime(elimit - t24h, '%Y%m%d')
 
                         timesave = ''.join(retr_param_dict['time'])
 
@@ -815,6 +813,12 @@ class EcFlexpart(object):
                                 self._mk_targetname(ftype, pk,
                                                     retr_param_dict['date'])
 
+                        if ftype.upper() == 'FC' and \
+                                'acc' not in retr_param_dict['target']:
+
+                            retr_param_dict['date'] = \
+                                datetime.strftime(elimit - t24h, '%Y%m%d')
+
                         # ******* start retrievement
                         self._start_retrievement(request, retr_param_dict)
                     else:
diff --git a/Source/Python/Mods/get_mars_data.py b/Source/Python/Mods/get_mars_data.py
index cdad4b6f68a4078acba29348894fbaa607bcb391..722eeb461569099f0c14cf87792e1cf5b31a780a 100755
--- a/Source/Python/Mods/get_mars_data.py
+++ b/Source/Python/Mods/get_mars_data.py
@@ -292,7 +292,7 @@ def mk_dates(c, fluxes):
     end = datetime.strptime(c.end_date, '%Y%m%d')
     chunk = timedelta(days=int(c.date_chunk))
 
-    if c.basetime == 0:  # non-fluxes
+    if c.basetime == 0 and not fluxes:  # non-fluxes
         start = start - timedelta(days=1)
 
     if c.purefc and fluxes and c.maxstep < 24: