PIM-3544 : fix CS