PIM-3531: fix cs