Fix #2532710