Fixed issue #12327
Merge pull request #12383 from marclennox/master

Fixed issue #12327