Corrections for pull request #630

Corrections for pull request #630