PIM-2531: Fixing CS