Fix CS.
Merge pull request #3891 from dereuromark/3.0-cs

fix cs