fix multiple addresses