PI6-2221 Fixed CS