issue #672 fixed