Merge pull request #12632 from mntechnique/solves_issue_#12588

Solves issue #12588