Fix #4804
2 files changed