fix #1094
Merge pull request #1114 from chrox/fix_1094

fix #1094