Simplify patch a little