More work on bug #8088.