Fix #6764