Fix #4044
2 files changed