Fixed race condition on AddressMap