fix #823
Merge pull request #824 from sclasen/sclasen-fix-823

fix #823