Fixed fill_values problem