fixup patch hand edit