Fix #2041
3 files changed