PIM-3384: fix cs