Fix issue #891
Merge pull request #892 from jacquerie/issue-891

Fix issue #891