PIM-3321: Fix cs