Fix #2827