Fix #7845