Fix #4669