Merge pull request #1906 from blackwhale/issue-12069

Fix issue 12069