More robust handling of EIP association