PIM-3367 : fix cs