PIM-2754 : fix cs