Defect Fixes

2500
2502