diff --git a/modules/aeolus/aeolus_amv.py b/modules/aeolus/aeolus_amv.py
index 07a9481a6831b7185e3467cbe8cf12cd8e9aaf04..5c92ff53c113992bb3dbc318a665c0413ceb1607 100644
--- a/modules/aeolus/aeolus_amv.py
+++ b/modules/aeolus/aeolus_amv.py
@@ -423,11 +423,11 @@ def run_best_fit(raob_to_amv_dct, raob_dct, gfs_filename=None):
             pdiff = np.abs(amv_prs - raob_prs)
             lev_idx = np.argmin(pdiff)
             if raob_spd[lev_idx] < 0 or raob_dir[lev_idx] < 0:
-                tup = (raob_spd[lev_idx], raob_dir[lev_idx], raob_prs[lev_idx], -9)
+                tup = (raob_prs[lev_idx], raob_spd[lev_idx], raob_dir[lev_idx], -9)
             elif pdiff[lev_idx] > 60.0:
-                tup = (raob_spd[lev_idx], raob_dir[lev_idx], raob_prs[lev_idx], -9)
+                tup = (raob_prs[lev_idx], raob_spd[lev_idx], raob_dir[lev_idx], -9)
             else:
-                tup = (raob_spd[lev_idx], raob_dir[lev_idx], raob_prs[lev_idx], 0)
+                tup = (raob_prs[lev_idx], raob_spd[lev_idx], raob_dir[lev_idx], 0)
             raob_match_list.append(tup)
 
             if do_gfs_best_fit:
@@ -860,13 +860,13 @@ def compare_amvs_bestfit_driver(all_list, bin_size=200):
     # values.append(bin_pres)
 
     values = []
-    bin_ranges, bin_pres, bin_spd, bin_dir = compare_amvs_bestfit(amvs_thin, bfs_thin, bin_size=bin_size)
+    bin_ranges, bin_pres, bin_spd, bin_dir = compare_amvs_bestfit(amvs_thin, rbm_thin, bin_size=bin_size)
     values.append(bin_spd)
 
-    bin_ranges, bin_pres, bin_spd, bin_dir = compare_amvs_bestfit(amvs_thick, bfs_thick, bin_size=bin_size)
+    bin_ranges, bin_pres, bin_spd, bin_dir = compare_amvs_bestfit(amvs_thick, rbm_thick, bin_size=bin_size)
     values.append(bin_spd)
 
-    bin_ranges, bin_pres, bin_spd, bin_dir = compare_amvs_bestfit(amvs, bfs, bin_size=bin_size)
+    bin_ranges, bin_pres, bin_spd, bin_dir = compare_amvs_bestfit(amvs, rbm, bin_size=bin_size)
     values.append(bin_spd)
 
     make_plot(bin_ranges, values)