PIM-2781 : fix CS