fix addres when name_in_master is defined