Fix for Bug 26927