Fix #4737
2 files changed