fix for bug 3640075