Fix #6027