Issue #858 fixed