fixing CS