Fix #4109
2 files changed