Added an extra call to data_var_select and a comment to explain why.