PIM-3196 : fix CS