if 'country_id' in values and values['country_id'] != '':
            new_values['country_id'] = int(values.get('country_id', 0))