issue #680 fixed