issue #671 done