Defect fix, bugid #1