fixed #1120
Merge pull request #1121 from sabian/master

fixed #1120