PIM-3224 : fix CS