Fix #4431
2 files changed