issue #642