diff --git a/modules/aeolus/aeolus_amv.py b/modules/aeolus/aeolus_amv.py
index a5ca928c717fdc0a30fc44d11504ebcf2920a993..571692b87902646ee544961f923855d949ace1ea 100644
--- a/modules/aeolus/aeolus_amv.py
+++ b/modules/aeolus/aeolus_amv.py
@@ -1668,7 +1668,7 @@ def get_search_box(nav, lon, lat):
 # return dict: aeolus time -> tuple (amv_lon, amv_lat, amv_pres, amv_spd, amv_dir)
 def match_amvs_to_aeolus(aeolus_dict, amv_files_path, amv_source='OPS', band='14', amv_files=None):
     if amv_files is None:
-        amv_files = get_datasource(amv_files_path, 'FMWK')
+        amv_files = get_datasource(amv_files_path, amv_source, band=band)
     nav = amv_files.get_navigation()
     amv_params = amv_files.get_parameters()
     match_dict = {}
@@ -1846,7 +1846,9 @@ def create_amv_to_aeolus_match_file(aeolus_files_dir, amv_files_dir, outfile=Non
 
     amv_files = None
     if amv_source == 'CARR':
-        amv_files = get_datasource(amv_files_dir, 60, 'CARR', band=band)
+        amv_files = get_datasource(amv_files_dir, 'CARR', file_time_span==60, band=band)
+    else:
+        amv_files = get_datasource(amv_files_dir, amv_source, band=band)
 
     m_d = match_amvs_to_aeolus(a_d, amv_files_dir, amv_source, band, amv_files)