issue #962