diff --git a/src/libcode/vx_data2d_nc_pinterp/pinterp_file.cc b/src/libcode/vx_data2d_nc_pinterp/pinterp_file.cc
index c5dbe62a7b..964d32cad6 100644
--- a/src/libcode/vx_data2d_nc_pinterp/pinterp_file.cc
+++ b/src/libcode/vx_data2d_nc_pinterp/pinterp_file.cc
@@ -563,9 +563,10 @@ bool status = false;
 int i;
 short s;
 float f;
+double fill_value;
 double d = bad_data_double;
 double missing_value = get_var_missing_value(var);
-double fill_value    = get_var_fill_value(var);
+get_var_fill_value(var, fill_value);
 
 status = get_nc_data(var, &d, (long *)a);
 
diff --git a/src/libcode/vx_data2d_nccf/nccf_file.cc b/src/libcode/vx_data2d_nccf/nccf_file.cc
index 5235b1639d..0f45544ae3 100644
--- a/src/libcode/vx_data2d_nccf/nccf_file.cc
+++ b/src/libcode/vx_data2d_nccf/nccf_file.cc
@@ -893,8 +893,9 @@ double NcCfFile::getData(NcVar * var, const LongArray & a) const
   bool status = false;
   double d = bad_data_double;
 
+  double fill_value;
   double missing_value = get_var_missing_value(var);
-  double fill_value    = get_var_fill_value(var);
+  get_var_fill_value(var, fill_value);
 
   status = get_nc_data(var, &d, (long *)a);
 
@@ -1017,8 +1018,9 @@ bool NcCfFile::getData(NcVar * v, const LongArray & a, DataPlane & plane) const
   //  get the bad data values
   //
 
+  double fill_value;
   double missing_value = get_var_missing_value(v);
-  double fill_value    = get_var_fill_value(v);
+  get_var_fill_value(v, fill_value);
 
   //  set up the DataPlane object