issue #601