Fixed #1241
Merge pull request #1361 from EPuncker/master

Fixed #1241