fix bug 101
merge issue-101