PIM-1674 Fixes CS