Fix #4141