Fix CS
Merge pull request #598 from romainneutron/fix-cs

[3.9] Fix entities CS