Fix #3238

Close #3239