issue #690