Fix #2825