Issue #875 fixed