How about they make it so the trait only spreads it to opponents you're engaged with?