fix cc_or_id logic