added patch from Bug 740142