Fix CS to match CSR-2.