same change as prior pull request #426