More work on bug #7959.