Fix #2530500