Issue #828 fixed