Fix #4874
2 files changed