Fix for pull request #118