PIM-3129: Fix random CS