Fix for bug 959976