Fix issue #969