fix issue #1834
Merge pull request #1839 from chetverikov/3.8.x

fix issue #1834