fix findMappedAddress requiring both MappedAddress and XorMappedAddress