Fix #6840