issue #813 fixed