Change to fit_method_map