Fix #4871
2 files changed