issue #740 fixed