Fix #4865
3 files changed