Fix for bug26983