Fix #5297
2 files changed