Defect fix.. bugid#19