Fix #4362
3 files changed