Better fix for bug 826979