Fix #4723