fix CurrentAddressesService