Fix for bug 966750