Potential fix for pull request #33