PIM-3541 : fix CS