Fix CS [from Pr review]