Fixed issue #823
Merge pull request #824 from EPuncker/master

Fixed issue #823