issue #675 fixed