Fix #4678