issue #625