Fix #4304