Fix issue #680