Applied patch from bug #2234