[3.9] Fix CS