PIM-3318: fix cs