fix issue-101
merge bug fix issue-101