fix #106
Merge branch 'bug-106'