Fix for bug 959178