Fix #4695
2 files changed