Fix #4475
3 files changed