Fix issue #857
Merge pull request #858 from jacquerie/master

Fix issue #857