Fix #2827
Fix #2825