PIM-3005 : fix cs