Fix #4027
2 files changed