Fix #2585
2 files changed