fixing use of values vs _values_dict