Fix #4697