Fix defect (17796)
Fix defect (17796)