More work on bug #8298.