diff --git a/modules/aeolus/aeolus_amv.py b/modules/aeolus/aeolus_amv.py
index 4c29633430b62b4586d01381937414fe0b907d59..832b270b7641ee87d18550ec7ca1d79ff1714657 100644
--- a/modules/aeolus/aeolus_amv.py
+++ b/modules/aeolus/aeolus_amv.py
@@ -1557,6 +1557,7 @@ def create_aeolus_clavrx_match_file(match_dct, filename, clvrx_params):
     atimes = []
     elems = []
     lines = []
+    fidxs = []
 
     # scan to get max num levels
     keys = list(match_dct.keys())
@@ -1572,6 +1573,7 @@ def create_aeolus_clavrx_match_file(match_dct, filename, clvrx_params):
             atimes.append(key)
             elems.append(tup[0])
             lines.append(tup[1])
+            fidxs.append(tup[2])
 
             nlevs = prof.shape[0]
             if nlevs > max_num_alevels:
@@ -1582,6 +1584,7 @@ def create_aeolus_clavrx_match_file(match_dct, filename, clvrx_params):
     atimes = np.array(atimes)
     elems = np.array(elems)
     lines = np.array(lines)
+    fidxs = np.array(fidxs)
 
     # Sample file to retrieve and copy variable attributes
     rg_exmpl = Dataset('/home/rink/data/clavrx/clavrx_OR_ABI-L1b-RadF-M6C01_G16_s20192930000343.level2.nc', 'r')
@@ -1733,8 +1736,9 @@ def match_amvs_to_aeolus_fast(aeolus_dict, amv_files_path, amv_source='OPS', ban
             ds.close()
 
         for prof in profs:
-            lat = prof[0, 0]
-            lon = prof[0, 1]
+            profv = prof.values
+            lat = profv[0, 0]
+            lon = profv[0, 1]
 
             cc_prf, ll_prf = nav.earth_to_lc(lon, lat)
             if cc_prf is None or ll_prf is None: