Issue #817 fixed