fix #835
Merge pull request #836 from chrox/fix_835

fix #835