Fix #3161
3 files changed