[ci skip] Fix #3869

Close #3978
Close #3979
2 files changed