[3.8] Fix CS