Fix for pull request #109