Fix #2353
2 files changed