fix #933
Merge pull request #934 from chrox/fix_933

fix #933