incorporate fix for bug 330964