Fix #4516
3 files changed