Fix #4933