Fix #4044