Fixed #1109
Merge pull request #1296 from EPuncker/master

Fixed #1109