Fix for pull request #9