fix some defect