Fix #4675
2 files changed