issue #621