fix issue-109/2,3,5,8,10