Fix #2498
2 files changed