Fixed AddressMarshaler