Fix issue #7282