updates for pull request #761