Issue #826 fixed