Fix #5276
3 files changed