Fix #2530941