Defect fix

2283