Patch mangling fix.