Fix #6939