Fix trello#r3kDqs3S, problems in _get_values_dict