issue #969