Fix #4120
2 files changed