Fix #4674
3 files changed