Fix issue 5224.
2 files changed