Fix issue with cc'd addresses [RD-84]