Fix #4696