change return value of UnmarshalAddress()