Fix #3201
3 files changed