More work on bug #7906.