Fix #4605
3 files changed