issue #724 fixed