Fix #4923
4 files changed