Fix for bug 963654