PIM-3250 : fix CS