Switched to using getaddresses [MJ-706]