Changes for defect 23- TQC buyoff