PIM-3129: fix CS