defect fixes
bug fixes