diff --git a/modules/amv/caliop_clavrx_amv.py b/modules/amv/caliop_clavrx_amv.py
index a37848ac3193c3596420ad7a21d92e8527fa0440..f0d22dfccd080864b6ac7023e87375ece575178e 100644
--- a/modules/amv/caliop_clavrx_amv.py
+++ b/modules/amv/caliop_clavrx_amv.py
@@ -366,12 +366,13 @@ def compute_and_add_geo_hgt(path_to_amvs, path_to_gfs, amv_source, band='14', ou
 
     for fname in amv_filenames:
         print('Start:  ', fname)
+
         nom_time = amv_ds.get_datetime(fname).timestamp()
         amvs_nd = get_amv_nd(fname, delimiter=',')
         amvs_nd = filter_amvs(amvs_nd)
+        num_amvs = amvs_nd.shape[0]
         amv_lons = amvs_nd[:, amv_lon_idx]
         amv_lats = amvs_nd[:, amv_lat_idx]
-        num_amvs = amvs_nd.shape[0]
 
         gfs_fname, _, _ = gfs_ds.get_file(nom_time, window=180.0)
         if gfs_fname is None:
@@ -395,8 +396,10 @@ def compute_and_add_geo_hgt(path_to_amvs, path_to_gfs, amv_source, band='14', ou
         alt_f = np.array(alt_f)
         alt_f = np.reshape(alt_f, [num_amvs, 1])
         amvs_nd = np.hstack([amvs_nd, alt_f])
+
         new_amv_fname = os.path.split(fname)[1]
         np.savetxt(new_amv_fname, amvs_nd, fmt=num_fmts, header=new_header, delimiter=',')
+
         print('Done...')
 
     alt_s = np.array(alt_s)