Fix #2639
2 files changed