better handling of CA link