PIM-3371 : fix CS