slight refactoring for pull request #27

ticket #68915