Fix #885
Merge pull request #899 from samoht/885

885