github-issue: #8