defect fix

2294, 2304