Issue #813 fixed