Fix #4312
2 files changed