[3.9] Fix entities CS