Fix #2682
4 files changed