Fix #3787
2 files changed