Fix pull request #66