fix #1623
Merge pull request #1624 from DarkCs/0.9

fix #1623