Fix #4116
Close #4117
2 files changed