Fix #4015
2 files changed