Fix #6444