Fix extractAddresses()