Fix #4000
2 files changed