Fix pull request #2007