Fix #2027
6 files changed