Fixed #1243
Merge pull request #1297 from EPuncker/master

Fixed #1243