Fix #2533159