PIM-2919 : fix CS