[3.8] Fix cs