Fixed patch to match source