Fix #1811
2 files changed