issue #681 improvements