Fix defect (17796)