fix #938
Merge pull request #940 from osa1/master

fix #938