Fix #4407
2 files changed