Fix #4633
3 files changed