PIM-2230 : fix CS