Fix gh-issue #6