Merge pull request #2376 from DmitryOlshansky/issue-12923

Fix issue 12923