PIM-3420: fix CS