fix #1829
Merge pull request #1830 from zender/master

fix #1829