issue #681 fixed