Fix #4023

Close #4024
2 files changed