Merge fix based on #924 discussions
Merge pull request #941 from voloda/Issue#924

Merge fix based on #924 discussions