fix #1110
Merge pull request #1118 from Soul1355/master

fix #1110