Fix #6696