PIM-3551 : fix CS