Fix CS consistency