More work on bug #8161.