Fixed #1337
Changes related to #1336
Merge pull request #1341 from EPuncker/master

Fixed #1337