Fix #1745
3 files changed