Fix #4809
2 files changed