Defect fix.. bugid #2