Addressed CA1020.