fix for bug 790008