Fix #4647
2 files changed