manual fix for pull request #6