Fix #6836