fix bug issue-101