Issue #801 fixed