diff --git a/modules/amv/caliop_clavrx_amv.py b/modules/amv/caliop_clavrx_amv.py
index 74d312a9bac2a841b6c0164fb75aab5252cd83e6..6c57be6980f94ef4aacaeca7c4d6b8861a8f40ad 100644
--- a/modules/amv/caliop_clavrx_amv.py
+++ b/modules/amv/caliop_clavrx_amv.py
@@ -280,9 +280,6 @@ def create_file(match_dct, output_path, target_filepath, caliop_clavrx_params, a
             dist = tup[7]
             alt = tup[8]
 
-            dst_to_amvs[idx, 0:cnt] = dist
-            amv_geom_hgt[idx, 0:cnt] = alt
-
             for pidx, param in enumerate(caliop_clavrx_params):
                 nda = data_nd[pidx]
                 nc4_vars_cc[pidx][idx] = nda
@@ -303,6 +300,9 @@ def create_file(match_dct, output_path, target_filepath, caliop_clavrx_params, a
             cnt = nda.shape[0]
             amv_line[idx, 0:cnt] = nda
 
+            dst_to_amvs[idx, 0:cnt] = dist
+            amv_geom_hgt[idx, 0:cnt] = alt
+
             for pidx, param in enumerate(amv_params):
                 nda = amvs_nd[pidx+4,]
                 cnt = nda.shape[0]