repair issue #3