Fix for bug 26927