Fix #3112
4 files changed