Fix issue #829
Merge pull request #830 from jacquerie/master

Fix issue #829