pull request to fix issue #99