Fix #4019