Fix #4536