Applied patch from bug #2360