PIM-2234 : fix CS