PIM-3321 : fix cs