Fix #3913
3 files changed