[RFR] fixing CS