Fix issue #15826.