issue #678