Fix #5260
3 files changed