Fix #4679
3 files changed