see previous 3 commits
fix #102