Fix #3419
2 files changed