Fix #2298
2 files changed