fixed #1117
Merge pull request #1122 from sabian/master

fixed #1117