fix for bug809397