THis fixes #8261.