issue #804 fixed