PIM-2592 : fix CS