defect fix bugid #21 #22