Fix for bug 886671