Fix issue #67