PIM-2221 Fixed CS