Fix for CA with imports breaking local variable CA