GitHub issue #67