Fix #3823
3 files changed