Fix issue #833
Merge pull request #834 from jacquerie/master

Fix issue #833