diff --git a/modules/amv/caliop_clavrx_amv.py b/modules/amv/caliop_clavrx_amv.py
index f58517c45184dd7b6be5d6131519a89a5f130986..b9fd448b20e12be3c95b86fc1323f2b81037a504 100644
--- a/modules/amv/caliop_clavrx_amv.py
+++ b/modules/amv/caliop_clavrx_amv.py
@@ -263,6 +263,7 @@ def create_file(match_dct, filename, caliop_clavrx_params, amv_params, amv_filen
 
 
 def run_caliop_clavrx_amv_match(output_file, path_to_caliop_clavrx, path_to_amvs, amv_source='OPS', band='14'):
+    caliop_clavrx_params = get_parameters_caliop_clavrx()
 
     caliop_clavrx_ds = CLAVRx_CALIPSO(path_to_caliop_clavrx)
 
@@ -270,9 +271,8 @@ def run_caliop_clavrx_amv_match(output_file, path_to_caliop_clavrx, path_to_amvs
     amv_params = amv_ds.get_parameters()
     amv_filenames = amv_ds.flist
 
-    match_dict = match_calipso_clavrx_to_amvs(caliop_clavrx_ds, None, amv_ds, amv_source=amv_source, band=band)
-
-    caliop_clavrx_params = get_parameters_caliop_clavrx()
+    for file in caliop_clavrx_ds.flist:
+        match_dict = match_calipso_clavrx_to_amvs(caliop_clavrx_ds, file, amv_ds, amv_source=amv_source, band=band)
 
-    create_file(match_dict, output_file, caliop_clavrx_params, amv_params, amv_filenames)
+        create_file(match_dict, output_file, caliop_clavrx_params, amv_params, amv_filenames)