Fix #4012
2 files changed