Fix #1957
2 files changed