Fix #1985
3 files changed