better handling of addresses