Fix issue #870
Merge pull request #871 from jacquerie/issue-870

Fix issue #870