More work on bug #7579.