Refix #1931
Merge pull request #1967 from eMerzh/refix_1931

Refix #1931