diff --git a/modules/amv/caliop_clavrx_amv.py b/modules/amv/caliop_clavrx_amv.py
index 0624cf93de61d288089e767f719cd3f75c894365..6a3a7c6383c8a055a92b9c4990fde230af601756 100644
--- a/modules/amv/caliop_clavrx_amv.py
+++ b/modules/amv/caliop_clavrx_amv.py
@@ -41,7 +41,8 @@ def match_calipso_clavrx_to_amvs(calipso_clavrx_ds, calipso_clavrx_file, amv_fil
     nom_time = calipso_clavrx_ds.get_datetime(calipso_clavrx_file).timestamp()
     calipso_clavrx_nc4 = Dataset(calipso_clavrx_file)
 
-    amv_fname, ftime, f_idx = amv_files.get_file_containing_time(nom_time)
+    # amv_fname, ftime, f_idx = amv_files.get_file_containing_time(nom_time)
+    amv_fname, ftime, f_idx = amv_files.get_file(nom_time)
     if f_idx is None:
         return None
 
@@ -273,7 +274,7 @@ def run_caliop_clavrx_amv_match(output_path, path_to_caliop_clavrx, path_to_amvs
 
     caliop_clavrx_ds = CLAVRx_CALIPSO(path_to_caliop_clavrx)
 
-    amv_ds = get_datasource(path_to_amvs, amv_source, band=band)
+    amv_ds = get_datasource(path_to_amvs, amv_source, file_time_span=20, band=band)
     amv_params = amv_ds.get_parameters()
     amv_filenames = amv_ds.flist