Issue #877 fixed