PIM-3363 : fix cs