fixed the address handling code, now Go 1.1 compatible.