Possible fix for #474
Merge pull request #475 from kozhevnikov/develop

Possible fix for #474, confirmed