issue #765 fixed