Fix #4066
3 files changed