fix #1879
Merge pull request #1897 from micklat/master

fix #1879