fix bug 101
fix conflict from issue-101