Fix #6057