PIM-3260 : fix cs