PIM-2641 : fix CS