issue #634