Merge pull request #877 from jeromerobert/bug873