PIM-2300 : fix CS